diff options
| author | Andrew MacBean <macbean@apache.org> | 2014-10-08 16:34:10 +0000 |
|---|---|---|
| committer | Andrew MacBean <macbean@apache.org> | 2014-10-08 16:34:10 +0000 |
| commit | 596241e890427e48f78917b9b82aa73816dd2dd6 (patch) | |
| tree | 0c0796c35f48463065523b82089df2957919366a /qpid/java/broker-core/src | |
| parent | 30eda2c517fe78eca4ccb42a5cc44a44af3ef7f7 (diff) | |
| download | qpid-python-596241e890427e48f78917b9b82aa73816dd2dd6.tar.gz | |
QPID-6134: [Java Broker] Restarting a node that has detected an intruder should go back into the ERROR state not ACTIVE
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1630167 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-core/src')
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index 1832ec4732..e6f79fef16 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -949,7 +949,12 @@ public abstract class AbstractConfiguredObject<X extends ConfiguredObject<X>> im if(desiredState == getDesiredState() && desiredState != state) { attainStateIfOpenedOrReopenFailed(); - return getState(); + final State currentState = getState(); + if (currentState != state) + { + notifyStateChanged(state, currentState); + } + return currentState; } else { |