cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1521202 - /cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
Date Mon, 09 Sep 2013 17:23:24 GMT
Author: dkulp
Date: Mon Sep  9 17:23:24 2013
New Revision: 1521202

URL: http://svn.apache.org/r1521202
Log:
Merged revisions 1521197 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1521197 | dkulp | 2013-09-09 13:19:31 -0400 (Mon, 09 Sep 2013) | 10 lines

  Merged revisions 1521193 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1521193 | dkulp | 2013-09-09 13:13:41 -0400 (Mon, 09 Sep 2013) | 2 lines

    [CXF-5257] Set the JMS expiration header

  ........

........

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

Modified: cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java?rev=1521202&r1=1521201&r2=1521202&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSUtils.java
Mon Sep  9 17:23:24 2013
@@ -506,9 +506,9 @@ public final class JMSUtils {
         if (messageProperties.isSetJMSDeliveryMode()) {
             jmsMessage.setJMSDeliveryMode(messageProperties.getJMSDeliveryMode());
         }
-        // if (messageProperties.isSetTimeToLive()) {
-        // jmsMessage.setJMSExpiration(expiration);
-        // }
+        if (messageProperties.isSetJMSExpiration()) {
+            jmsMessage.setJMSExpiration(messageProperties.getJMSExpiration());
+        }
         if (messageProperties.isSetJMSPriority()) {
             jmsMessage.setJMSPriority(messageProperties.getJMSPriority());
         }



Mime
View raw message