[jboss-cvs] JBossAS SVN: r57793 - projects/security/trunk/src/main/org/jboss/security

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

Author: anil.saldhana at jboss.com
Date: 2006-10-24 12:42:23 -0400 (Tue, 24 Oct 2006)
New Revision: 57793

Modified:
   projects/security/trunk/src/main/org/jboss/security/SecurityAssociation.java
Log:
Check the context map

Modified: projects/security/trunk/src/main/org/jboss/security/SecurityAssociation.java
===================================================================
--- projects/security/trunk/src/main/org/jboss/security/SecurityAssociation.java	2006-10-24 14:33:17 UTC (rev 57792)
+++ projects/security/trunk/src/main/org/jboss/security/SecurityAssociation.java	2006-10-24 16:42:23 UTC (rev 57793)
@@ -400,8 +400,10 @@
       if (sm != null)
          sm.checkPermission(getContextInfo);
 
+      if(key == null)
+         throw new IllegalArgumentException("key is null");
       HashMap contextInfo = (HashMap) threadContextMap.get();
-      return contextInfo.get(key);
+      return contextInfo != null ? contextInfo.get(key) : null;
    }
 
    /**
@@ -565,7 +567,7 @@
          SecurityAssociation.credential = null;
       }
       // Remove all subject contexts
-      threadSubjectStacks.clear();
+      threadSubjectStacks.clear(); 
    }
 
    /**