[jboss-cvs] Picketbox SVN: r221 - trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication.

[jboss-cvs-commits at lists.jboss.org]

Author: mmoyses
Date: 2011-05-17 14:09:07 -0400 (Tue, 17 May 2011)
New Revision: 221

Modified:
   trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java
Log:
Avoid NPEs

Modified: trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java
===================================================================
--- trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java	2011-05-13 16:13:28 UTC (rev 220)
+++ trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java	2011-05-17 18:09:07 UTC (rev 221)
@@ -170,15 +170,18 @@
    {
       if (trace)
          log.trace("Flushing all entried from the cache");
-      domainCache.clear();
+      if (domainCache != null)
+         domainCache.clear();
    }
 
    @Override
    public void flushCache(Principal key)
    {
-      if (trace)
-         log.trace("Flushing " + key.getName() + " from cache");
-      domainCache.remove(key);
+      if (domainCache != null && key != null) {
+         if (trace)
+            log.trace("Flushing " + key.getName() + " from cache");
+         domainCache.remove(key);
+      }
    }
 
    @Override
@@ -190,7 +193,9 @@
    @Override
    public boolean containsKey(Principal key)
    {
-      return domainCache.containsKey(key);
+      if (domainCache != null && key != null)
+         return domainCache.containsKey(key);
+      return false;
    }
    
    @Override
@@ -222,9 +227,9 @@
     */
    private DomainInfo getCacheInfo(Principal principal)
    {
-      if (domainCache == null)
-         return null;
-      return domainCache.get(principal);
+      if (domainCache != null && principal != null)
+         return domainCache.get(principal);
+      return null;
    }
 
    /**
@@ -422,7 +427,7 @@
    private Subject updateCache(LoginContext loginContext, Subject subject, Principal principal, Object credential)
    {
       // If we don't have a cache there is nothing to update
-      if (domainCache == null)
+      if (domainCache == null || principal == null)
          return subject;
 
       DomainInfo info = new DomainInfo();