diff options
| author | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-12-06 16:05:46 +0000 |
|---|---|---|
| committer | Andrew Donald Kennedy <grkvlt@apache.org> | 2010-12-06 16:05:46 +0000 |
| commit | 80ba5c5efdc23e3922b8f8f5152ceeaefa6951b6 (patch) | |
| tree | 2eb2141eb77d43701e718b5b5ab1cbd07401015f /qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java | |
| parent | 1d44d6e7a3369fb7773ba50d02c3baa8955da382 (diff) | |
| download | qpid-python-grkvlt-network-20101013.tar.gz | |
Attempt one at merge from r1021441:HEADgrkvlt-network-20101013
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20101013@1042697 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java')
| -rw-r--r-- | qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java index 0865165925..2e694b24ea 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java +++ b/qpid/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 { |