You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/08/21 17:05:39 UTC
svn commit: r687775 - in /cxf/branches/2.1.x-fixes: ./
rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Author: dkulp
Date: Thu Aug 21 08:05:39 2008
New Revision: 687775
URL: http://svn.apache.org/viewvc?rev=687775&view=rev
Log:
Merged revisions 687363 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r687363 | ffang | 2008-08-20 10:52:09 -0400 (Wed, 20 Aug 2008) | 1 line
[CXF-1755]JMSConduit need copy protocol headers to response in Message
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 21 08:05:39 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687387,687463
+/cxf/trunk:686333-686363,686764,686820,687096,687363,687387,687463
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 21 08:05:39 2008
@@ -1 +1 @@
-/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687387,687463
+/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687363,687387,687463
Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=687775&r1=687774&r2=687775&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Thu Aug 21 08:05:39 2008
@@ -373,6 +373,7 @@
//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 + "]");