Index: oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserManagerImplTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserManagerImplTest.java	(revision Local version)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserManagerImplTest.java	(revision Shelved version)
@@ -178,10 +178,14 @@
             }
         } finally {
             root.refresh();
-            folder.getTree().remove();
+            Tree tree = root.getTree(path);
+            if (tree != null) {
+                tree.remove();
+            }
             root.commit();
         }
 
+        userNode = new NodeUtil(root.getTree(user.getPath()));
         NodeUtil someContent = userNode.addChild("mystuff", JcrConstants.NT_UNSTRUCTURED);
         path = someContent.getTree().getPath();
         try {
@@ -204,6 +208,8 @@
             }
 
             // authNode - anyNode - authFolder -> create User
+            userNode = new NodeUtil(root.getTree(user.getPath()));
+            someContent = userNode.addChild("mystuff", JcrConstants.NT_UNSTRUCTURED);
             folder = someContent.addChild("folder", UserConstants.NT_REP_AUTHORIZABLE_FOLDER);
             root.commit(); // this time save node structure
             try {
\ No newline at end of file
Index: oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java	(revision Local version)
+++ oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserProviderTest.java	(revision Shelved version)
@@ -218,8 +218,9 @@
         m.put("%\r|", '/' +Text.escapeIllegalJcrChars("%")+ '/' + Text.escapeIllegalJcrChars("%\r") + '/' + Text.escapeIllegalJcrChars("%\r|"));
 
         for (String uid : m.keySet()) {
-            Tree user = userProvider.createUser(uid, null);
+            userProvider.createUser(uid, null);
             root.commit();
+            Tree user = userProvider.getAuthorizable(uid);
 
             assertEquals(defaultUserPath + m.get(uid), user.getPath());
             assertEquals(uid, userProvider.getAuthorizableId(user));
Index: oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java	(revision Local version)
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImpl.java	(revision Shelved version)
@@ -44,6 +44,7 @@
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.core.IdentifierManager;
 import org.apache.jackrabbit.oak.plugins.name.NamespaceConstants;
@@ -194,6 +195,8 @@
                 }
                 root.commit();
 
+                String tokenPath = PathUtils.concat(PathUtils.concat(user.getPath(), TOKENS_NODE_NAME), tokenName);
+                tokenNode = new NodeUtil(root.getTree(tokenPath));
                 return new TokenInfoImpl(tokenNode, token, userId);
             } else {
                 log.debug("Cannot create login token: No corresponding node for User " + userId + '.');