[jboss-svn-commits] JBL Code SVN: r23005 - in labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb: services/security and 1 other directory.

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

Author: beve
Date: 2008-09-23 03:17:23 -0400 (Tue, 23 Sep 2008)
New Revision: 23005

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java
Log:
Changed then name of setSecurityContext to setContext to match the getContext method.
Also removed transient from the thread local variable as this should be serialized.


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-09-23 05:23:03 UTC (rev 23004)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/listeners/message/ActionProcessingPipeline.java	2008-09-23 07:17:23 UTC (rev 23005)
@@ -431,7 +431,7 @@
     			SecurityServiceFactory.getSecurityService().authenticate(securityConf, securityContext, authRequest);
 
     			//  seal the security context add as a thread local
-    			SecurityContext.setSecurityContext(PrivateCryptoUtil.INSTANCE.encrypt(securityContext));
+    			SecurityContext.setContext(PrivateCryptoUtil.INSTANCE.encrypt(securityContext));
 		    }
 		}
 		catch (final SecurityServiceException e)
@@ -464,7 +464,7 @@
 		Boolean processResult = (Boolean) Subject.doAsPrivileged(securityContext.getSubject(), action, null);
 
 		//  unset the security context from the thread local
-		SecurityContext.setSecurityContext(null);
+		SecurityContext.setContext(null);
 
 		return processResult.booleanValue();
 	}

Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java	2008-09-23 05:23:03 UTC (rev 23004)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/services/security/SecurityContext.java	2008-09-23 07:17:23 UTC (rev 23005)
@@ -47,14 +47,14 @@
 {
 	private static final long serialVersionUID = 1L;
 
-	private static transient ThreadLocal<byte[]> context = new ThreadLocal<byte[]>();
+	private static ThreadLocal<byte[]> context = new ThreadLocal<byte[]>();
 
 	public static byte[] getContext()
 	{
 	    return context.get();
 	}
 
-	public static void setSecurityContext(final byte[] encrypted)
+	public static void setContext(final byte[] encrypted)
 	{
 	    context.set(encrypted);
 	}