From 596241e890427e48f78917b9b82aa73816dd2dd6 Mon Sep 17 00:00:00 2001
From: Andrew MacBean <macbean@apache.org>
Date: Wed, 8 Oct 2014 16:34:10 +0000
Subject: 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
---
 .../org/apache/qpid/server/model/AbstractConfiguredObject.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'qpid/java/broker-core/src')

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
                                 {
-- 
cgit v1.2.1