svn commit: r1685839 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java

[angela]

Author: angela
Date: Tue Jun 16 14:01:34 2015
New Revision: 1685839

URL: http://svn.apache.org/r1685839
Log:
OAK-2994 : AbstractSecurityTest#getUserManager(Root) doesn't create new 
instances

Modified:
    
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java?rev=1685839&r1=1685838&r2=1685839&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractSecurityTest.java
 Tue Jun 16 14:01:34 2015
@@ -72,7 +72,6 @@ public abstract class AbstractSecurityTe
     private ContentRepository contentRepository;
     private UserManager userManager;
     private User testUser;
-    private PrivilegeManager privMgr;
 
     protected NamePathMapper namePathMapper = NamePathMapper.DEFAULT;
     protected SecurityProvider securityProvider;
@@ -154,10 +153,14 @@ public abstract class AbstractSecurityTe
     }
 
     protected UserManager getUserManager(Root root) {
-        if (userManager == null) {
-            userManager = 
getConfig(UserConfiguration.class).getUserManager(root, getNamePathMapper());
+        if (this.root == root) {
+            if (userManager == null) {
+                userManager = 
getConfig(UserConfiguration.class).getUserManager(root, getNamePathMapper());
+            }
+            return userManager;
+        } else {
+            return getConfig(UserConfiguration.class).getUserManager(root, 
getNamePathMapper());
         }
-        return userManager;
     }
 
     protected PrincipalManager getPrincipalManager(Root root) {
@@ -187,10 +190,7 @@ public abstract class AbstractSecurityTe
     }
 
     protected PrivilegeManager getPrivilegeManager(Root root) {
-        if (privMgr == null) {
-            privMgr = 
getConfig(PrivilegeConfiguration.class).getPrivilegeManager(root, 
getNamePathMapper());
-        }
-        return privMgr;
+        return 
getConfig(PrivilegeConfiguration.class).getPrivilegeManager(root, 
getNamePathMapper());
     }
 
     protected ValueFactory getValueFactory() {