jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1466135 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Date Tue, 09 Apr 2013 17:10:06 GMT
Author: mduerig
Date: Tue Apr  9 17:10:06 2013
New Revision: 1466135

URL: http://svn.apache.org/r1466135
Log:
OAK-709: Consider moving permission evaluation to the node state level
refresh existing permissions provider in rebase instead of allocating a new instance

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java?rev=1466135&r1=1466134&r2=1466135&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
(original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
Tue Apr  9 17:10:06 2013
@@ -236,8 +236,9 @@ public class RootImpl implements Root {
             purgePendingChanges();
             branch.rebase();
             reset();
-            // FIXME clarify: why set to null here and refresh below?
-            permissionProvider = null;
+            if (permissionProvider != null) {
+                permissionProvider.refresh();
+            }
         }
     }
 



Mime
View raw message