You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ul...@apache.org on 2008/08/11 11:15:20 UTC

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

Author: ulhasbhole
Date: Mon Aug 11 02:15:19 2008
New Revision: 684688

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

........
  r684687 | ulhasbhole | 2008-08-11 10:09:23 +0100 (Mon, 11 Aug 2008) | 3 lines
  
  * Moved pooledSession recycle call to finally block for recycling the session in case of exceptions or normal return. 
........

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

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

Modified: cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java?rev=684688&r1=684687&r2=684688&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java (original)
+++ cxf/branches/2.0.x-fixes/rt/transports/jms/src/main/java/org/apache/cxf/transport/jms/JMSConduit.java Mon Aug 11 02:15:19 2008
@@ -257,10 +257,11 @@
                 if (!isOneWay) {
                     handleResponse();
                 }
-                base.sessionFactory.recycle(pooledSession);
             } catch (JMSException jmsex) {
                 getLogger().log(Level.WARNING, "JMS connect failed with JMSException : ", jmsex);            
                 throw new IOException(jmsex.toString());
+            } finally {
+                base.sessionFactory.recycle(pooledSession);
             }
         }