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 2011/01/31 21:48:21 UTC

svn commit: r1065771 - in /cxf/branches/2.3.x-fixes: ./ rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java

Author: dkulp
Date: Mon Jan 31 20:48:21 2011
New Revision: 1065771

URL: http://svn.apache.org/viewvc?rev=1065771&view=rev
Log:
Merged revisions 1065594 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1065594 | cschneider | 2011-01-31 08:13:28 -0500 (Mon, 31 Jan 2011) | 1 line
  
  CXF-3230 Only log exception instead of rethrowing to work around problem with hornetq
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=1065771&r1=1065770&r2=1065771&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Mon Jan 31 20:48:21 2011
@@ -246,7 +246,8 @@ public class JMSConduit extends Abstract
                         try {
                             ((TemporaryQueue)replyToDestination).delete();
                         } catch (JMSException e) {
-                            throw new RuntimeException("Unable to remove temporary queue", e);
+                            // Only log the exception as the exchange should be able to proceed
+                            LOG.log(Level.WARNING, "Unable to remove temporary queue: " + e.getMessage(), e);
                         }
                     }
                 }