cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r780960 - /cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
Date Tue, 02 Jun 2009 07:45:49 GMT
Author: ningjiang
Date: Tue Jun  2 07:45:48 2009
New Revision: 780960

URL: http://svn.apache.org/viewvc?rev=780960&view=rev
Log:
CXF-2243 Fixed the jms test error

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

Modified: cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java?rev=780960&r1=780959&r2=780960&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
(original)
+++ cxf/branches/2.1.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSFactory.java
Tue Jun  2 07:45:48 2009
@@ -94,7 +94,10 @@
         jmsTemplate.setPubSubDomain(jmsConfig.isPubSubDomain());
         if (jmsConfig.getReceiveTimeout() != null) {
             jmsTemplate.setReceiveTimeout(jmsConfig.getReceiveTimeout());
-        }
+        } else {
+            // set the default value for support the spring 2.0.x
+            jmsTemplate.setReceiveTimeout(0);
+        }  
         jmsTemplate.setTimeToLive(jmsConfig.getTimeToLive());
         int priority = (headers != null && headers.isSetJMSPriority())
             ? headers.getJMSPriority() : jmsConfig.getPriority();
@@ -141,7 +144,7 @@
         jmsListener.setMessageListener(listenerHandler);
         if (jmsConfig.getReceiveTimeout() != null) {
             jmsListener.setReceiveTimeout(jmsConfig.getReceiveTimeout());
-        }
+        } 
         if (jmsConfig.getRecoveryInterval() != JMSConfiguration.DEFAULT_VALUE) {
             jmsListener.setRecoveryInterval(jmsConfig.getRecoveryInterval());
         }



Mime
View raw message