[jboss-cvs] JBossAS SVN: r114838 - branches/JBPAPP_5_2_0_GA_JBPAPP-11221/tomcat/src/main/org/jboss/web/tomcat/security.

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

Author: dehort
Date: 2015-05-08 22:13:55 -0400 (Fri, 08 May 2015)
New Revision: 114838

Modified:
   branches/JBPAPP_5_2_0_GA_JBPAPP-11221/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java
Log:
[JBPAPP-11221] JBossWebRealm.hasRole throws a NullPointerException



Modified: branches/JBPAPP_5_2_0_GA_JBPAPP-11221/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java
===================================================================
--- branches/JBPAPP_5_2_0_GA_JBPAPP-11221/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java	2015-05-09 02:11:55 UTC (rev 114837)
+++ branches/JBPAPP_5_2_0_GA_JBPAPP-11221/tomcat/src/main/org/jboss/web/tomcat/security/JaccContextValve.java	2015-05-09 02:13:55 UTC (rev 114838)
@@ -96,13 +96,7 @@
       }
       finally
       {
-         SecurityAssociationValve.activeWebMetaData.set(null);
-         ActiveRequestResponseCacheValve.activeRequest.set(null);
-         ActiveRequestResponseCacheValve.activeResponse.set(null);
-         SecurityAssociationActions.clear();
-         activeCS.set(null);
-         SecurityRolesAssociation.setSecurityRoles(null);
-         HttpServletRequestPolicyContextHandler.setRequest(null); 
+         cleanUp();
       }
    }
 
@@ -134,14 +128,17 @@
       }
       finally
       {
-         SecurityAssociationValve.activeWebMetaData.set(null);
-         ActiveRequestResponseCacheValve.activeRequest.set(null);
-         ActiveRequestResponseCacheValve.activeResponse.set(null);
-         SecurityAssociationActions.clear();
-         activeCS.set(null);
-         SecurityRolesAssociation.setSecurityRoles(null);
-         HttpServletRequestPolicyContextHandler.setRequest(null); 
+         cleanUp();
       }
    }
-   
-}
\ No newline at end of file
+
+   private void cleanUp() {
+      SecurityAssociationValve.activeWebMetaData.set(null);
+      //ActiveRequestResponseCacheValve.activeRequest.set(null); 
+      //ActiveRequestResponseCacheValve.activeResponse.set(null); 
+      SecurityAssociationActions.clear();
+      activeCS.set(null);
+      SecurityRolesAssociation.setSecurityRoles(null);
+      HttpServletRequestPolicyContextHandler.setRequest(null); 
+   }
+}