You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/12/27 13:11:36 UTC
svn commit: r1553667 - in /qpid/branches/java-broker-bdb-ha/qpid/java:
bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java
broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
Author: orudyy
Date: Fri Dec 27 12:11:36 2013
New Revision: 1553667
URL: http://svn.apache.org/r1553667
Log:
QPID-5413: Implement functionality to change virtual host state from REST interfaces
Modified:
qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java
qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java?rev=1553667&r1=1553666&r2=1553667&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/VirtualHostRestTest.java Fri Dec 27 12:11:36 2013
@@ -70,6 +70,8 @@ public class VirtualHostRestTest extends
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
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
Modified: qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java?rev=1553667&r1=1553666&r2=1553667&view=diff
==============================================================================
--- qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java (original)
+++ qpid/branches/java-broker-bdb-ha/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java Fri Dec 27 12:11:36 2013
@@ -1268,7 +1268,12 @@ public final class VirtualHostAdapter ex
{
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));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org