svn commit: r1669116 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java

[angela]

Author: angela
Date: Wed Mar 25 13:21:26 2015
New Revision: 1669116

URL: http://svn.apache.org/r1669116
Log:
OAK-2674 : Fix FindBug Issues (possible null dereference in TokenLoginModue 
getRoot())

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java?rev=1669116&r1=1669115&r2=1669116&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
 Wed Mar 25 13:21:26 2015
@@ -159,7 +159,10 @@ public final class TokenLoginModule exte
         if (tokenProvider != null && 
sharedState.containsKey(SHARED_KEY_CREDENTIALS)) {
             Credentials shared = getSharedCredentials();
             if (shared != null && tokenProvider.doCreateToken(shared)) {
-                getRoot().refresh(); // refresh root, in case the external 
login module created users
+                Root r = getRoot();
+                if (r != null) {
+                    r.refresh(); // refresh root, in case the external login 
module created users
+                }
                 TokenInfo ti = tokenProvider.createToken(shared);
                 if (ti != null) {
                     TokenCredentials tc = new TokenCredentials(ti.getToken());