[jboss-svn-commits] JBL Code SVN: r23186 - labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/client.

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

Author: beve
Date: 2008-09-29 10:35:24 -0400 (Mon, 29 Sep 2008)
New Revision: 23186

Modified:
   labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2081 "Security context remains in the message after ServiceInvoker usage"


Modified: labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2008-09-29 13:39:13 UTC (rev 23185)
+++ labs/jbossesb/branches/JBESB_4_4_GA_CP/product/rosetta/src/org/jboss/soa/esb/client/ServiceInvoker.java	2008-09-29 14:35:24 UTC (rev 23186)
@@ -340,9 +340,13 @@
 
 	                replyMessage = eprInvoker.attemptDelivery(message, epr);
 	                if (replyMessage != null) {
+                        // remove the security context so that it is not exposed to the action pipeline.
+                        replyMessage.getProperties().remove(SecurityService.CONTEXT);
+
                         if (Type.isFaultMessage(replyMessage)) {
                             Factory.createExceptionFromFault(replyMessage) ;
                         }
+
                         // We've delivered it, we're done!
 	                    return replyMessage;
 	                } else {
@@ -377,6 +381,7 @@
             		 * DO NOT remove from the registry - it is not dead!!
             		 */
             	}
+
             }
         }