You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2010/02/16 11:46:41 UTC

svn commit: r910461 - /sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java

Author: fmeschbe
Date: Tue Feb 16 10:46:40 2010
New Revision: 910461

URL: http://svn.apache.org/viewvc?rev=910461&view=rev
Log:
SLING-1379  Support adapt to User and Group

Modified:
    sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java

Modified: sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java?rev=910461&r1=910460&r2=910461&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-usermanager/src/main/java/org/apache/sling/jackrabbit/usermanager/impl/resource/AuthorizableResource.java Tue Feb 16 10:46:40 2010
@@ -21,6 +21,8 @@
 import javax.jcr.RepositoryException;
 
 import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.jackrabbit.api.security.user.Group;
+import org.apache.jackrabbit.api.security.user.User;
 import org.apache.sling.adapter.SlingAdaptable;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceMetadata;
@@ -107,7 +109,9 @@
         if (type == Map.class || type == ValueMap.class) {
             return (AdapterType) new AuthorizableValueMap(authorizable); // unchecked
                                                                          // cast
-        } else if (type == Authorizable.class) {
+        } else if (type == Authorizable.class
+            || (type == User.class && !authorizable.isGroup())
+            || (type == Group.class && authorizable.isGroup())) {
             return (AdapterType) authorizable;
         }