cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ff...@apache.org
Subject svn commit: r687535 - /cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Date Thu, 21 Aug 2008 01:46:02 GMT
Author: ffang
Date: Wed Aug 20 18:46:02 2008
New Revision: 687535

URL: http://svn.apache.org/viewvc?rev=687535&view=rev
Log:
[CXF-1755]populate headers for inMessage directly instead of changing OutMessage

Modified:
    cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=687535&r1=687534&r2=687535&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
(original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Wed Aug 20 18:46:02 2008
@@ -138,10 +138,11 @@
      * Receive mechanics.
      *
      * @param pooledSession the shared JMS resources
+     * @param inMessage 
      * @retrun the response buffer
      */
     private Object receive(PooledSession pooledSession,
-                           Message outMessage) throws JMSException {
+                           Message outMessage, Message inMessage) throws JMSException {
         
         Object result = null;
         
@@ -158,7 +159,7 @@
 
         if (jmsMessage != null) {
             
-            base.populateIncomingContext(jmsMessage, outMessage, JMSConstants.JMS_CLIENT_RESPONSE_HEADERS);
+            base.populateIncomingContext(jmsMessage, inMessage, JMSConstants.JMS_CLIENT_RESPONSE_HEADERS);
             result = base.unmarshal(jmsMessage);
             return result;
         } else {
@@ -364,17 +365,13 @@
             //              outMessage.get(JMSConstants.JMS_CLIENT_RESPONSE_HEADERS));
                         
             try {
-                response = receive(pooledSession, outMessage);
+                response = receive(pooledSession, outMessage, inMessage);
             } catch (JMSException jmsex) {
                 getLogger().log(Level.FINE, "JMS connect failed with JMSException : ", jmsex);
           
                 throw new IOException(jmsex.toString());
             }  
 
-            //set the message header back to the incomeMessage
-            inMessage.put(JMSConstants.JMS_CLIENT_RESPONSE_HEADERS, 
-                          outMessage.get(JMSConstants.JMS_CLIENT_RESPONSE_HEADERS));
 
-            inMessage.put(Message.PROTOCOL_HEADERS, outMessage.get(Message.PROTOCOL_HEADERS));
             getLogger().log(Level.FINE, "The Response Message is : [" + response + "]");
             
             // setup the inMessage response stream



Mime
View raw message