You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/08/24 22:45:28 UTC

svn commit: r988721 - /tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java

Author: nash
Date: Tue Aug 24 20:45:27 2010
New Revision: 988721

URL: http://svn.apache.org/viewvc?rev=988721&view=rev
Log:
Merge revision 980735 from trunk into the 1.6.1 branch

Modified:
    tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java

Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java?rev=988721&r1=988720&r2=988721&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/transport/TransportServiceInterceptor.java Tue Aug 24 20:45:27 2010
@@ -115,6 +115,7 @@ public class TransportServiceInterceptor
     }
     
     public Message invokeResponse(Message msg) { 
+        JMSBindingContext context = msg.getBindingContext();
         try {
 
             //if operation is oneway, return back.
@@ -123,7 +124,6 @@ public class TransportServiceInterceptor
                 return msg;
             }
 
-            JMSBindingContext context = msg.getBindingContext();
             Session session = context.getJmsResponseSession();
             javax.jms.Message requestJMSMsg = context.getJmsMsg();
             javax.jms.Message responseJMSMsg = msg.getBody();
@@ -168,12 +168,13 @@ public class TransportServiceInterceptor
             producer.send((javax.jms.Message)msg.getBody());
     
             producer.close();
-            context.closeJmsResponseSession();
             
             return msg;
     
         } catch (JMSException e) {
             throw new JMSBindingException(e);
+        } finally {
+            context.closeJmsResponseSession();
         }
     }