From 8a1958a5fb00577878215bef6f9fc0e65af6b724 Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 16 Jul 2010 15:20:16 +0000 Subject: QPID-2742: Gather exchange type name properly, and remove the extraneous statement execution and move its closure after use use the output ResultSet. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@964829 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/qpid/server/store/DerbyMessageStore.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'java/broker/src') 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 ae4f6f3796..62f2d14e09 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 @@ -618,17 +618,17 @@ public class DerbyMessageStore implements MessageStore PreparedStatement stmt = conn.prepareStatement(FIND_EXCHANGE); stmt.setString(1, exchange.getNameShortString().toString()); - stmt.execute(); - stmt.close(); ResultSet rs = stmt.executeQuery(); // If we don't have any data in the result set then we can add this exchange if (!rs.next()) { + stmt.close(); + stmt = conn.prepareStatement(INSERT_INTO_EXCHANGE); stmt.setString(1, exchange.getName().toString()); - stmt.setString(2, exchange.getType().toString()); + stmt.setString(2, exchange.getTypeShortString().asString()); stmt.setShort(3, exchange.isAutoDelete() ? (short) 1 : (short) 0); stmt.execute(); stmt.close(); -- cgit v1.2.1