svn commit: r1541178 - in /jackrabbit/oak/trunk: oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java

[angela]

Author: angela
Date: Tue Nov 12 17:50:14 2013
New Revision: 1541178

URL: http://svn.apache.org/r1541178
Log:
minor improvement

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
    
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java?rev=1541178&r1=1541177&r2=1541178&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
 Tue Nov 12 17:50:14 2013
@@ -255,7 +255,7 @@ abstract class AuthorizableImpl implemen
         Iterator<String> oakPaths = mMgr.getMembership(getTree(), 
includeInherited);
 
         Authorizable everyoneGroup = 
userManager.getAuthorizable(EveryonePrincipal.getInstance());
-        if (everyoneGroup != null && everyoneGroup instanceof GroupImpl) {
+        if (everyoneGroup instanceof GroupImpl) {
             String everyonePath = ((GroupImpl) 
everyoneGroup).getTree().getPath();
             oakPaths = Iterators.concat(oakPaths, 
ImmutableSet.of(everyonePath).iterator());
         }

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1541178&r1=1541177&r2=1541178&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
 Tue Nov 12 17:50:14 2013
@@ -541,7 +541,7 @@ public class ImporterImpl implements Imp
         }
     }
 
-    private class Reference {
+    private static final class Reference {
 
         private final Tree tree;
         private final PropertyState property;