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:11:11 UTC
svn commit: r687777 - 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:11:11 2008
New Revision: 687777
URL: http://svn.apache.org/viewvc?rev=687777&view=rev
Log:
Merged revisions 687543 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r687543 | ffang | 2008-08-20 23:07:44 -0400 (Wed, 20 Aug 2008) | 1 line
[CXF-1755]populate headers for inMessage directly instead of changing OutMessage
........
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:11:11 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687363,687387,687463
+/cxf/trunk:686333-686363,686764,686820,687096,687363,687387,687463,687543
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 21 08:11:11 2008
@@ -1 +1 @@
-/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687363,687387,687463
+/cxf/trunk:1-686342,686344-686363,686764,686820,687096,687363,687387,687463,687543
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=687777&r1=687776&r2=687777&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:11:11 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,16 +365,12 @@
// 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 + "]");