svn commit: r798346 - in /cxf/trunk: rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java

[dkulp]

Author: dkulp
Date: Tue Jul 28 01:07:55 2009
New Revision: 798346

URL: http://svn.apache.org/viewvc?rev=798346&view=rev
Log:
[CXF-2363] Fix issue with JMS transport not honoring the reply
destinations set in config.

Modified:
    
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
    
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java

Modified: 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java?rev=798346&r1=798345&r2=798346&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 (original)
+++ 
cxf/trunk/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSDestination.java
 Tue Jul 28 01:07:55 2009
@@ -43,6 +43,7 @@
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.continuations.ContinuationProvider;
 import org.apache.cxf.continuations.SuspendedInvocationException;
 import org.apache.cxf.interceptor.OneWayProcessorInterceptor;
@@ -133,6 +134,8 @@
             return resolveDestinationName(jmsTemplate, replyToName);
         } else if (message.getJMSReplyTo() != null) {
             return message.getJMSReplyTo();
+        } else if (!StringUtils.isEmpty(jmsConfig.getReplyDestination())) {
+            return resolveDestinationName(jmsTemplate, 
jmsConfig.getReplyDestination());
         } else {
             throw new RuntimeException("No replyTo destination set on request 
message or cxf message");
         }

Modified: 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java?rev=798346&r1=798345&r2=798346&view=diff
==============================================================================
--- 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
 (original)
+++ 
cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jms/JMSClientServerTest.java
 Tue Jul 28 01:07:55 2009
@@ -627,7 +627,10 @@
         }
     
         for (Thread t : threads) {
-            t.join(5000);
+            t.join(10000);
+        }
+        for (Thread t : threads) {
+            t.join(1000);
             assertTrue("No terminated state: " + t.getState(), t.getState() == 
State.TERMINATED);
         }