diff options
2 files changed, 9 insertions, 2 deletions
diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java index b38568ab15..3d92573dea 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java +++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java @@ -70,6 +70,8 @@ public class VirtualHostRestTest extends QpidRestTestCase responseCode = getRestTestHelper().submitRequest("/rest/virtualhost/" + hostName, "PUT", hostData); assertEquals("Unexpected response code for virtual host update status", 200, responseCode); + Map<String, Object> replicationNodeDetails = getRestTestHelper().getJsonAsSingletonList("/rest/replicationnode/" + hostName + "/" + nodeName); + assertLocalNode(nodeData, replicationNodeDetails); try { // make sure that the host is saved in the broker store @@ -85,7 +87,7 @@ public class VirtualHostRestTest extends QpidRestTestCase assertLocalNode(nodeData, nodes.get(0)); // verify that that node rest interface returns the same node attributes - Map<String, Object> replicationNodeDetails = getRestTestHelper().getJsonAsSingletonList("/rest/replicationnode/" + hostName + "/" + nodeName); + replicationNodeDetails = getRestTestHelper().getJsonAsSingletonList("/rest/replicationnode/" + hostName + "/" + nodeName); assertLocalNode(nodeData, replicationNodeDetails); } finally diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java index 73b436c8d7..7968b6d00d 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java @@ -1268,7 +1268,12 @@ public final class VirtualHostAdapter extends AbstractAdapter implements Virtual { State newState = MapValueConverter.getEnumAttribute(State.class, STATE, attributes); State actualState = getActualState(); - if (actualState != newState ) + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug(String.format("Change virtual host %s state from %s to %s", getName(), actualState.toString(), + newState.toString())); + } + if (actualState != newState && setState(actualState, newState)) { super.changeAttributes(Collections.<String, Object>singletonMap(STATE, newState)); } |