[sling-org-apache-sling-jcr-jackrabbit-usermanager] 06/24: SLING-2066 improve error reporting for validation errors

[rombert]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag 
org.apache.sling.jcr.jackrabbit.usermanager-2.2.0
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-jackrabbit-usermanager.git

commit c9dbf96811ed3bdeeaf3d923a62b2eb856643034
Author: Eric Norman <enor...@apache.org>
AuthorDate: Sun May 1 23:06:30 2011 +0000

    SLING-2066 improve error reporting for validation errors
    
    git-svn-id: 
https://svn.apache.org/repos/asf/sling/trunk/bundles/jcr/jackrabbit-usermanager@1098436
 13f79535-47bb-0310-9956-ffa450edef68
---
 .../usermanager/impl/post/CreateGroupServlet.java  | 60 ++++++++++------------
 .../usermanager/impl/post/CreateUserServlet.java   |  2 +-
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
 
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
index 5a24c84..5e2ea88 100644
--- 
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
+++ 
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateGroupServlet.java
@@ -95,7 +95,7 @@ public class CreateGroupServlet extends 
AbstractGroupPostServlet {
 
         // check that the submitted parameter values have valid values.
         final String principalName = 
request.getParameter(SlingPostConstants.RP_NODE_NAME);
-        if (principalName == null) {
+        if (principalName == null || principalName.length() == 0) {
             throw new RepositoryException("Group name was not submitted");
         }
 
@@ -104,41 +104,37 @@ public class CreateGroupServlet extends 
AbstractGroupPostServlet {
             throw new RepositoryException("JCR Session not found");
         }
 
-        try {
-            UserManager userManager = 
AccessControlUtil.getUserManager(session);
-            Authorizable authorizable = 
userManager.getAuthorizable(principalName);
+        UserManager userManager = AccessControlUtil.getUserManager(session);
+        Authorizable authorizable = userManager.getAuthorizable(principalName);
 
-            if (authorizable != null) {
-                // principal already exists!
-                throw new RepositoryException(
-                    "A principal already exists with the requested name: "
-                        + principalName);
-            } else {
-                Group group = userManager.createGroup(new Principal() {
-                    public String getName() {
-                        return principalName;
-                    }
-                });
+        if (authorizable != null) {
+            // principal already exists!
+            throw new RepositoryException(
+                "A principal already exists with the requested name: "
+                    + principalName);
+        } else {
+            Group group = userManager.createGroup(new Principal() {
+                public String getName() {
+                    return principalName;
+                }
+            });
 
-                String groupPath = 
AuthorizableResourceProvider.SYSTEM_USER_MANAGER_GROUP_PREFIX
-                    + group.getID();
-                
-                Map<String, RequestProperty> reqProperties = collectContent(
-                    request, response, groupPath);
-                response.setPath(groupPath);
-                response.setLocation(externalizePath(request, groupPath));
-                response.setParentLocation(externalizePath(request,
-                    
AuthorizableResourceProvider.SYSTEM_USER_MANAGER_GROUP_PATH));
-                changes.add(Modification.onCreated(groupPath));
+            String groupPath = 
AuthorizableResourceProvider.SYSTEM_USER_MANAGER_GROUP_PREFIX
+                + group.getID();
+            
+            Map<String, RequestProperty> reqProperties = collectContent(
+                request, response, groupPath);
+            response.setPath(groupPath);
+            response.setLocation(externalizePath(request, groupPath));
+            response.setParentLocation(externalizePath(request,
+                AuthorizableResourceProvider.SYSTEM_USER_MANAGER_GROUP_PATH));
+            changes.add(Modification.onCreated(groupPath));
 
-                // write content from form
-                writeContent(session, group, reqProperties, changes);
+            // write content from form
+            writeContent(session, group, reqProperties, changes);
 
-                // update the group memberships
-                updateGroupMembership(request, group, changes);
-            }
-        } catch (RepositoryException re) {
-            throw new RepositoryException("Failed to create new group.", re);
+            // update the group memberships
+            updateGroupMembership(request, group, changes);
         }
     }
 }
diff --git 
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
 
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
index a72ea5a..34cf4c2 100644
--- 
a/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
+++ 
b/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/post/CreateUserServlet.java
@@ -195,7 +195,7 @@ public class CreateUserServlet extends 
AbstractUserPostServlet {
 
         // check that the submitted parameter values have valid values.
         String principalName = 
request.getParameter(SlingPostConstants.RP_NODE_NAME);
-        if (principalName == null) {
+        if (principalName == null || principalName.length() == 0) {
             throw new RepositoryException("User name was not submitted");
         }
         String pwd = request.getParameter("pwd");

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <commits@sling.apache.org>.