[jboss-svn-commits] JBossWS SVN: r692 - in trunk/src/main/java/org/jboss/ws: jaxrpc jaxws/client server transport/jms

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

Author: thomas.diesler at jboss.com
Date: 2006-08-04 10:38:53 -0400 (Fri, 04 Aug 2006)
New Revision: 692

Modified:
   trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java
   trunk/src/main/java/org/jboss/ws/jaxws/client/JAXWSClient.java
   trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
   trunk/src/main/java/org/jboss/ws/transport/jms/JMSMessageDispatcher.java
Log:
popMessageContext in finally

Modified: trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java	2006-08-04 14:30:52 UTC (rev 691)
+++ trunk/src/main/java/org/jboss/ws/jaxrpc/CallImpl.java	2006-08-04 14:38:53 UTC (rev 692)
@@ -107,7 +107,7 @@
    {
       super(service.getServiceMetaData());
       this.jaxrpcService = service;
-      
+
       if (epMetaData != null)
          setTargetEndpointAddress(epMetaData.getEndpointAddress());
    }
@@ -120,7 +120,7 @@
    {
       super(epMetaData);
       this.jaxrpcService = service;
-      
+
       setTargetEndpointAddress(epMetaData.getEndpointAddress());
    }
 
@@ -133,7 +133,7 @@
    {
       super(service.getServiceMetaData(), portName, opName);
       this.jaxrpcService = service;
-      
+
       if (epMetaData != null)
          setTargetEndpointAddress(epMetaData.getEndpointAddress());
    }
@@ -149,7 +149,7 @@
    {
       return properties;
    }
-   
+
    /**
     * Add a header that is not bound to an input parameter.
     * A propriatory extension, that is not part of JAXRPC.
@@ -491,7 +491,7 @@
     */
    public Object getProperty(String name)
    {
-      if(null == name)
+      if (null == name)
          throw new JAXRPCException("Unsupported property: " + name);
       // CTS: com/sun/ts/tests/jaxrpc/api/javax_xml_rpc/Call/Client.java#SetGetPropertyTest2
       if (name.startsWith("javax.xml.rpc") && standardProperties.contains(name) == false)
@@ -504,7 +504,7 @@
     */
    public void setProperty(String name, Object value)
    {
-      if(null == name)
+      if (null == name)
          throw new JAXRPCException("Unsupported property: " + name);
       // CTS: com/sun/ts/tests/jaxrpc/api/javax_xml_rpc/Call/Client.java#SetGetPropertyTest2
       if (name.startsWith("javax.xml.rpc") && standardProperties.contains(name) == false)
@@ -544,9 +544,15 @@
       // Associate a message context with the current thread
       SOAPMessageContextJAXRPC msgContext = new SOAPMessageContextJAXRPC();
       MessageContextAssociation.pushMessageContext(msgContext);
-      
-      Object retObj = super.invoke(opName, inputParams, unboundHeaders, oneway);
-      return retObj;
+      try
+      {
+         Object retObj = super.invoke(opName, inputParams, unboundHeaders, oneway);
+         return retObj;
+      }
+      finally
+      {
+         MessageContextAssociation.popMessageContext();
+      }
    }
 
    @Override
@@ -564,7 +570,7 @@
       String[] roles = null;
 
       SOAPMessageContextJAXRPC msgContext = (SOAPMessageContextJAXRPC)MessageContextAssociation.peekMessageContext();
-      
+
       HandlerChain handlerChain = jaxrpcService.getHandlerChain(portName);
       if (handlerChain != null)
       {

Modified: trunk/src/main/java/org/jboss/ws/jaxws/client/JAXWSClient.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/jaxws/client/JAXWSClient.java	2006-08-04 14:30:52 UTC (rev 691)
+++ trunk/src/main/java/org/jboss/ws/jaxws/client/JAXWSClient.java	2006-08-04 14:38:53 UTC (rev 692)
@@ -45,7 +45,7 @@
 public class JAXWSClient extends CommonClient implements BindingProvider
 {
    private BindingProvider bindingProvider = new BindingProviderImpl();
-   
+
    public JAXWSClient(EndpointMetaData epMetaData)
    {
       super(epMetaData);
@@ -68,14 +68,20 @@
    {
       // Associate a message context with the current thread
       SOAPMessageContextJAXWS msgContext = new SOAPMessageContextJAXWS();
-      MessageContextAssociation.pushMessageContext(msgContext);
-      
+
       // Mark the message context as outbound
       msgContext.setProperty(MessageContextJAXWS.MESSAGE_OUTBOUND_PROPERTY, new Boolean(true));
-      
-      Object retObj = invoke(opName, args, null, false);
-      
-      return retObj;
+
+      MessageContextAssociation.pushMessageContext(msgContext);
+      try
+      {
+         Object retObj = invoke(opName, args, null, false);
+         return retObj;
+      }
+      finally
+      {
+         MessageContextAssociation.popMessageContext();
+      }
    }
 
    @Override

Modified: trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java	2006-08-04 14:30:52 UTC (rev 691)
+++ trunk/src/main/java/org/jboss/ws/server/ServiceEndpointManager.java	2006-08-04 14:38:53 UTC (rev 692)
@@ -376,8 +376,8 @@
          
       }
       msgContext.setEndpointMetaData(sepMetaData);
+      
       MessageContextAssociation.pushMessageContext(msgContext);
-
       try
       {
          SOAPMessage resMessage = wsEndpoint.handleRequest(headerSource, context, inStream);

Modified: trunk/src/main/java/org/jboss/ws/transport/jms/JMSMessageDispatcher.java
===================================================================
--- trunk/src/main/java/org/jboss/ws/transport/jms/JMSMessageDispatcher.java	2006-08-04 14:30:52 UTC (rev 691)
+++ trunk/src/main/java/org/jboss/ws/transport/jms/JMSMessageDispatcher.java	2006-08-04 14:38:53 UTC (rev 692)
@@ -98,9 +98,16 @@
             msgContext.setProperty(MessageContextJAXWS.INBOUND_MESSAGE_ATTACHMENTS, new HashMap<String, DataHandler>());
          }
          msgContext.setEndpointMetaData(sepMetaData);
+
          MessageContextAssociation.pushMessageContext(msgContext);
-         
-         return sep.handleRequest(null, null, reqMessage);
+         try
+         {
+            return sep.handleRequest(null, null, reqMessage);
+         }
+         finally
+         {
+            MessageContextAssociation.popMessageContext();
+         }
       }
       catch (BindingException ex)
       {