Author: struberg
Date: Fri Aug 3 22:06:59 2012
New Revision: 1369229
URL: http://svn.apache.org/viewvc?rev=1369229&view=rev
Log:
OWB-691 cleanup JMS connection if we get an error
Modified:
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
Modified:
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java?rev=1369229&r1=1369228&r2=1369229&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
(original)
+++
openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsProxyHandler.java
Fri Aug 3 22:06:59 2012
@@ -154,16 +154,28 @@ public class JmsProxyHandler implements
private Session createSession()
{
+ Connection connection = null;
try
{
- Connection connection = createOrReturnQueueOrTopicConnection();
+ connection = createOrReturnQueueOrTopicConnection();
return connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
}
catch (JMSException e)
{
+ if (connection != null)
+ {
+ try
+ {
+ connection.close();
+ }
+ catch (JMSException jmse)
+ {
+ // do nothing, we are already throwing up anyway...
+ }
+ }
throw new WebBeansException("Unable to create jms session", e);
}