You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/12/22 22:57:59 UTC
svn commit: r1775768 [2/2] - in /qpid/java/trunk:
bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/configuration/store/
broker-core/src/main/java/org/apache/qpid/server/model/ br...
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java?rev=1775768&r1=1775767&r2=1775768&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostQueryServlet.java Thu Dec 22 22:57:59 2016
@@ -127,15 +127,15 @@ public class VirtualHostQueryServlet ext
while (element != null && element != VirtualHost.class)
{
hierarchy.add(element);
- final Collection<Class<? extends ConfiguredObject>> parentTypes =
- model.getParentTypes(element);
- if(parentTypes == null || parentTypes.isEmpty())
+ final Class<? extends ConfiguredObject> parentType =
+ model.getParentType(element);
+ if(parentType == null)
{
break;
}
else
{
- element = parentTypes.iterator().next();
+ element = parentType;
}
}
Collections.reverse(hierarchy);
@@ -159,15 +159,15 @@ public class VirtualHostQueryServlet ext
while (element != null && element != Connection.class)
{
hierarchy.add(element);
- final Collection<Class<? extends ConfiguredObject>> parentTypes =
- model.getParentTypes(element);
- if (parentTypes == null || parentTypes.isEmpty())
+ final Class<? extends ConfiguredObject> parentType =
+ model.getParentType(element);
+ if (parentType == null)
{
break;
}
else
{
- element = parentTypes.iterator().next();
+ element = parentType;
}
}
Collections.reverse(hierarchy);
Modified: qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java?rev=1775768&r1=1775767&r2=1775768&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConfiguredObjectToMapConverterTest.java Thu Dec 22 22:57:59 2016
@@ -333,7 +333,7 @@ public class ConfiguredObjectToMapConver
// set actual values
when(mockChild.getActualAttributes()).thenReturn(Collections.singletonMap("secureAttribute", "secret"));
when(_configuredObject.getChildren(TestChild.class)).thenReturn(Arrays.asList(mockChild));
- when(model.getParentTypes(TestChild.class)).thenReturn(Collections.<Class<? extends ConfiguredObject>>singleton(TestChild.class));
+ when(model.getParentType(TestChild.class)).thenReturn((Class)TestChild.class);
when(_configuredObject.getCategoryClass()).thenReturn(TestChild.class);
when(mockChild.isDurable()).thenReturn(true);
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1775768&r1=1775767&r2=1775768&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Thu Dec 22 22:57:59 2016
@@ -154,7 +154,7 @@ public class VirtualHostMessageStoreTest
ObjectMapper objectMapper = new ObjectMapper();
Map<String, Object> attrs = objectMapper.readValue(bluePrint, Map.class);
virtualHostAttributes.putAll(attrs);
- _node.createChild(VirtualHost.class, virtualHostAttributes, _node);
+ _node.createChild(VirtualHost.class, virtualHostAttributes);
_virtualHost = (QueueManagingVirtualHost<?>)_node.getVirtualHost();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org