diff options
| author | Robert Gemmell <robbie@apache.org> | 2010-11-17 00:31:02 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2010-11-17 00:31:02 +0000 |
| commit | 89dcce9937284d384bf8d6d8498b9710dbe03b02 (patch) | |
| tree | 39e4878153ae55531ee6c974bb40a9fcd059858b /java/broker | |
| parent | b4f1e0b9104b84fd092a3d2d4285eade712656ff (diff) | |
| download | qpid-python-89dcce9937284d384bf8d6d8498b9710dbe03b02.tar.gz | |
QPID-2950: correct the shutdown exception check to verify the SQLCode is for single-db shutdown rather than full Derby engine shutdown
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1035880 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java | 6 |
1 files changed, 4 insertions, 2 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 0865165925..2e694b24ea 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 @@ -134,6 +134,8 @@ public class DerbyMessageStore implements MessageStore private static final String DELETE_FROM_META_DATA = "DELETE FROM " + META_DATA_TABLE_NAME + " WHERE message_id = ?"; private static final String SELECT_ALL_FROM_META_DATA = "SELECT message_id, meta_data FROM " + META_DATA_TABLE_NAME; + private static final String DERBY_SINGLE_DB_SHUTDOWN_CODE = "08006"; + private LogSubject _logSubject; private boolean _configured; @@ -631,9 +633,9 @@ public class DerbyMessageStore implements MessageStore } catch (SQLException e) { - if (e.getSQLState().equalsIgnoreCase("XJ015")) + if (e.getSQLState().equalsIgnoreCase(DERBY_SINGLE_DB_SHUTDOWN_CODE)) { - //XJ015 is expected and represents a clean shutdown, do nothing. + //expected and represents a clean shutdown of this database only, do nothing. } else { |