cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1518369 - /cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
Date Wed, 28 Aug 2013 20:30:18 GMT
Author: dkulp
Date: Wed Aug 28 20:30:17 2013
New Revision: 1518369

URL: http://svn.apache.org/r1518369
Log:
Fix merge issue

Modified:
    cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java

Modified: cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java?rev=1518369&r1=1518368&r2=1518369&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/RequestResponseTest.java
Wed Aug 28 20:30:17 2013
@@ -201,25 +201,6 @@ public class RequestResponseTest extends
         setupMessageHeader(outMessage, null);
         final JMSDestination destination = setupJMSDestination(false);
         
-<<<<<<< HEAD
-        // set up MessageObserver for handling the conduit message
-        MessageObserver observer = new MessageObserver() {
-            public void onMessage(Message m) {
-                Exchange exchange = new ExchangeImpl();
-                exchange.setInMessage(m);
-                m.setExchange(exchange);
-                verifyReceivedMessage(m);
-                verifyHeaders(m, outMessage);
-                // setup the message for
-                Conduit backConduit;
-                try {
-                    backConduit = destination.getBackChannel(m, null, null);
-                    // wait for the message to be got from the conduit
-                    Message replyMessage = new MessageImpl();
-                    sendoutMessage(backConduit, replyMessage, true);
-                } catch (Exception e) {
-                    throw new RuntimeException(e);
-=======
         try {
             // set up MessageObserver for handling the conduit message
             MessageObserver observer = new MessageObserver() {
@@ -232,14 +213,13 @@ public class RequestResponseTest extends
                     // setup the message for
                     Conduit backConduit;
                     try {
-                        backConduit = destination.getBackChannel(m);
+                        backConduit = destination.getBackChannel(m, null, null);
                         // wait for the message to be got from the conduit
                         Message replyMessage = new MessageImpl();
                         sendoutMessage(backConduit, replyMessage, true);
                     } catch (Exception e) {
                         throw new RuntimeException(e);
                     }
->>>>>>> 8512bd8... Update to use ActiveMQ 5.8 for testing (and the pom
changes should allow much easier change to 5.9
                 }
             };
             destination.setMessageObserver(observer);



Mime
View raw message