You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/06/23 13:59:01 UTC
svn commit: r957168 -
/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
Author: robbie
Date: Wed Jun 23 11:59:01 2010
New Revision: 957168
URL: http://svn.apache.org/viewvc?rev=957168&view=rev
Log:
QPID-2684: Fix close logic in Derby store to only close when the connection is created locally
Applied patch from Andrew Kennedy <an...@gmail.com>
Modified:
qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
Modified: qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=957168&r1=957167&r2=957168&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java Wed Jun 23 11:59:01 2010
@@ -611,11 +611,6 @@ public class DerbyMessageStore extends A
{
stmt.close();
}
-
- if (conn != null)
- {
- conn.close();
- }
}
catch(SQLException e)
{
@@ -1018,11 +1013,6 @@ public class DerbyMessageStore extends A
{
stmt.close();
}
-
- if (conn != null)
- {
- conn.close();
- }
}
catch (SQLException e)
{
@@ -1084,11 +1074,6 @@ public class DerbyMessageStore extends A
{
stmt.close();
}
-
- if (conn != null)
- {
- conn.close();
- }
}
catch (SQLException e)
{
@@ -1274,11 +1259,6 @@ public class DerbyMessageStore extends A
{
stmt.close();
}
-
- if (conn != null)
- {
- conn.close();
- }
}
catch (SQLException e)
{
@@ -1346,11 +1326,6 @@ public class DerbyMessageStore extends A
{
stmt.close();
}
-
- if (conn != null)
- {
- conn.close();
- }
}
catch (SQLException e)
{
@@ -1449,11 +1424,6 @@ public class DerbyMessageStore extends A
{
stmt.close();
}
-
- if (conn != null)
- {
- conn.close();
- }
}
catch (SQLException e)
{
@@ -1538,11 +1508,6 @@ public class DerbyMessageStore extends A
{
stmt.close();
}
-
- if (conn != null)
- {
- conn.close();
- }
}
catch (SQLException e)
{
@@ -1693,7 +1658,7 @@ public class DerbyMessageStore extends A
stmt.close();
}
- if (inLocaltran && conn != null)
+ if (!inLocaltran && conn != null)
{
conn.close();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org