summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorCharles E. Rolke <chug@apache.org>2012-02-27 19:31:46 +0000
committerCharles E. Rolke <chug@apache.org>2012-02-27 19:31:46 +0000
commit5e47b4c0bd930bd3d672290a04f7b38fb98283be (patch)
treeba6690fe62fe1880ffd0c1eed3319f32b9536a21 /java
parentc3a0c2ec78970005da38d524f38939cc7f2fb3a7 (diff)
downloadqpid-python-5e47b4c0bd930bd3d672290a04f7b38fb98283be.tar.gz
Merge from trunk into branch
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-3799-acl@1294294 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
index 2cc9a5423e..4d63136a9d 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
@@ -2251,11 +2251,12 @@ public class DerbyMessageStore implements MessageStore, DurableConfigurationStor
PreparedStatement pstmt = conn.prepareStatement(SELECT_ALL_FROM_XID_ACTIONS);
- pstmt.setLong(1, xid.getFormat());
- pstmt.setBytes(2, xid.getGlobalId());
- pstmt.setBytes(3, xid.getBranchId());
try
{
+ pstmt.setLong(1, xid.getFormat());
+ pstmt.setBytes(2, xid.getGlobalId());
+ pstmt.setBytes(3, xid.getBranchId());
+
ResultSet rs = pstmt.executeQuery();
try
{