summaryrefslogtreecommitdiff
path: root/java/broker
diff options
context:
space:
mode:
authorAlex Rudyy <orudyy@apache.org>2013-05-17 15:31:05 +0000
committerAlex Rudyy <orudyy@apache.org>2013-05-17 15:31:05 +0000
commit6be3aa2ae579f2c35594e6e745f8b9eddc2d76cf (patch)
tree26edfc7909e21ead18f04f67ab953dd801529635 /java/broker
parentc38c89ba7ac3d5a4b6262e2d7825c2be7e7b2558 (diff)
downloadqpid-python-6be3aa2ae579f2c35594e6e745f8b9eddc2d76cf.tar.gz
QPID-4860: Show virtual host state in UI and transition virtual host into ERRORED state on failing to activate
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1483865 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker')
-rw-r--r--java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
index 2fa7899572..de626a7639 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
@@ -994,7 +994,22 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual
{
if (desiredState == State.ACTIVE)
{
- activate();
+ try
+ {
+ activate();
+ }
+ catch(RuntimeException e)
+ {
+ changeAttribute(STATE, State.INITIALISING, State.ERRORED);
+ if (_broker.isManagementMode())
+ {
+ LOGGER.warn("Failed to activate virtual host: " + getName(), e);
+ }
+ else
+ {
+ throw e;
+ }
+ }
return true;
}
else if (desiredState == State.STOPPED)