[Yanel-commits] rev 24202 - public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources

[michi at wyona.com]

Author: michi
Date: 2007-05-05 21:41:17 +0200 (Sat, 05 May 2007)
New Revision: 24202

Modified:
   public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
Log:
throw exception is user does not exist

Modified: public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java
===================================================================
--- public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java	2007-05-05 11:31:09 UTC (rev 24201)
+++ public/yanel/trunk/src/contributions/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/YanelUserResource.java	2007-05-05 19:41:17 UTC (rev 24202)
@@ -127,11 +127,14 @@
 
         try {
 
-            Transformer transformer = TransformerFactory.newInstance().newTransformer(
-                    new StreamSource(xslFile));
+            Transformer transformer = TransformerFactory.newInstance().newTransformer(new StreamSource(xslFile));
 
             String action = determineAction(request);
-            String userId = getUserId();            
+            String userId = getUserId();
+            if (userId == null) {
+                log.error("No user ID!");
+                throw new Exception("No user ID!");
+            }
 
             if (action.equals("submitProfile")) {
                 updateUserProfile(request, transformer);
@@ -153,6 +156,11 @@
 
             if(!action.equals("submitDelete")) {
                 User user = getRealm().getIdentityManager().getUserManager().getUser(userId);
+                if (user == null) {
+                    log.error("No such user: " + userId);
+                    throw new Exception("No such user: " + userId);
+                }
+
                 transformer.setParameter("userId", userId);
                 transformer.setParameter("userName", user.getName());
                 transformer.setParameter("email", user.getEmail());
@@ -179,8 +187,7 @@
                 transformer.setParameter("allGroupsString", allGroupsString);            
             }
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            transformer.transform(new javax.xml.transform.stream.StreamSource(xmlFile),
-                    new StreamResult(baos));
+            transformer.transform(new javax.xml.transform.stream.StreamSource(xmlFile), new StreamResult(baos));
 
             defaultView.setMimeType(MIME_TYPE);
             defaultView.setInputStream(new java.io.ByteArrayInputStream(baos.toByteArray()));
@@ -544,12 +551,16 @@
         return isValid;
     }
 
+    /**
+     * Get user id from resource configuration
+     */
     private String getUserId() throws Exception {
         String userId = null;
         ResourceConfiguration resConfig = getConfiguration();
         if(resConfig != null) {
             userId = getConfiguration().getProperty("user");
         } else {
+            log.warn("DEPRECATED: Do not use RTI but rather a resource configuration");
             userId = getRTI().getProperty("user");
         }
         return userId;