Author: robbie
Date: Wed Nov 17 00:36:14 2010
New Revision: 1035881
URL: http://svn.apache.org/viewvc?rev=1035881&view=rev
Log:
QPID-2950: correct the shutdown exception check to verify the SQLCode is for
single-db shutdown rather than full Derby engine shutdown
merged from trunk r1035880
Modified:
qpid/branches/0.8-release-candidates/qpid/java/broker/ (props changed)
qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
Propchange: qpid/branches/0.8-release-candidates/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov 17 00:36:14 2010
@@ -2,4 +2,4 @@
/qpid/branches/java-broker-0-10/qpid/java/broker:795950-829653
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1035026
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1035026,1035880
Modified:
qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=1035881&r1=1035880&r2=1035881&view=diff
==============================================================================
---
qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
(original)
+++
qpid/branches/0.8-release-candidates/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
Wed Nov 17 00:36:14 2010
@@ -134,6 +134,8 @@ public class DerbyMessageStore implement
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 implement
}
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
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
