diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-02-14 11:46:31 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-02-14 11:46:31 +0000 |
| commit | 763396a3a8c18a9b42e2cf611333e61d4c6444de (patch) | |
| tree | e3898eeb82ddca9e609ef2ba3b45ca271a675f6c /qpid/java/bdbstore/jmx | |
| parent | 50b314a51a2c787fcd412a84cb8464f72e3868b4 (diff) | |
| download | qpid-python-763396a3a8c18a9b42e2cf611333e61d4c6444de.tar.gz | |
QPID-5551 : Change AMQStoreException to StoreException which inherits from ServerScopedRuntimeException
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1568252 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/jmx')
2 files changed, 7 insertions, 7 deletions
diff --git a/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java index bab68c6f07..aa4ddd8181 100644 --- a/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java +++ b/qpid/java/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java @@ -36,7 +36,7 @@ import javax.management.openmbean.TabularDataSupport; import javax.management.openmbean.TabularType; import org.apache.log4j.Logger; -import org.apache.qpid.server.store.AMQStoreException; +import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.jmx.AMQManagedObject; import org.apache.qpid.server.jmx.ManagedObject; import org.apache.qpid.server.store.berkeleydb.BDBHAMessageStore; @@ -189,7 +189,7 @@ public class BDBHAMessageStoreManagerMBean extends AMQManagedObject implements M { _store.removeNodeFromGroup(nodeName); } - catch (AMQStoreException e) + catch (StoreException e) { LOGGER.error("Failed to remove node " + nodeName + " from group", e); throw new JMException(e.getMessage()); @@ -203,7 +203,7 @@ public class BDBHAMessageStoreManagerMBean extends AMQManagedObject implements M { _store.setDesignatedPrimary(primary); } - catch (AMQStoreException e) + catch (StoreException e) { LOGGER.error("Failed to set node " + _store.getNodeName() + " as designated primary", e); throw new JMException(e.getMessage()); @@ -217,7 +217,7 @@ public class BDBHAMessageStoreManagerMBean extends AMQManagedObject implements M { _store.updateAddress(nodeName, newHostName, newPort); } - catch(AMQStoreException e) + catch(StoreException e) { LOGGER.error("Failed to update address for node " + nodeName + " to " + newHostName + ":" + newPort, e); throw new JMException(e.getMessage()); diff --git a/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java b/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java index a74c9b3c87..54051ab630 100644 --- a/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java +++ b/qpid/java/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java @@ -37,7 +37,7 @@ import javax.management.openmbean.TabularData; import junit.framework.TestCase; -import org.apache.qpid.server.store.AMQStoreException; +import org.apache.qpid.server.store.StoreException; import org.apache.qpid.server.jmx.AMQManagedObject; import org.apache.qpid.server.jmx.ManagedObjectRegistry; import org.apache.qpid.server.logging.SystemOutMessageLogger; @@ -168,7 +168,7 @@ public class BDBHAMessageStoreManagerMBeanTest extends TestCase public void testRemoveNodeFromReplicationGroupWithError() throws Exception { - doThrow(new AMQStoreException("mocked exception")).when(_store).removeNodeFromGroup(TEST_NODE_NAME); + doThrow(new StoreException("mocked exception")).when(_store).removeNodeFromGroup(TEST_NODE_NAME); try { @@ -190,7 +190,7 @@ public class BDBHAMessageStoreManagerMBeanTest extends TestCase public void testSetAsDesignatedPrimaryWithError() throws Exception { - doThrow(new AMQStoreException("mocked exception")).when(_store).setDesignatedPrimary(true); + doThrow(new StoreException("mocked exception")).when(_store).setDesignatedPrimary(true); try { |