[jboss-cvs] JBoss Messaging SVN: r6663 - in trunk: tests/src/org/jboss/messaging/tests/integration/management and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jmesnil
Date: 2009-05-05 13:23:57 -0400 (Tue, 05 May 2009)
New Revision: 6663

Modified:
   trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java
   trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java
   trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
Log:
management refactoring

* fixed BroadcastGroupControl + related classes
* check for nullability in ManagementHelper.fromJSONArray

Modified: trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java	2009-05-05 16:52:13 UTC (rev 6662)
+++ trunk/src/main/org/jboss/messaging/core/client/management/impl/ManagementHelper.java	2009-05-05 17:23:57 UTC (rev 6663)
@@ -228,7 +228,14 @@
          }
          else
          {
-            array[i] = val;
+            if (val == JSONObject.NULL)
+            {
+               array[i] = null;
+            }
+            else
+            {
+               array[i] = val;
+            }
          }
       }
 

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java	2009-05-05 16:52:13 UTC (rev 6662)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlTest.java	2009-05-05 17:23:57 UTC (rev 6663)
@@ -28,9 +28,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularData;
-
 import org.jboss.messaging.core.config.Configuration;
 import org.jboss.messaging.core.config.TransportConfiguration;
 import org.jboss.messaging.core.config.cluster.BroadcastGroupConfiguration;
@@ -106,7 +103,7 @@
       
       Object[] connectorPairs = broadcastGroupControl.getConnectorPairs();
       assertEquals(1, connectorPairs.length);
-      String[] connectorPairData = (String[])connectorPairs[0];
+      Object[] connectorPairData = (Object[])connectorPairs[0];
       assertEquals(broadcastGroupConfig.getConnectorInfos().get(0).a, connectorPairData[0]);
       assertEquals(broadcastGroupConfig.getConnectorInfos().get(0).b, connectorPairData[1]);
       

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlUsingCoreTest.java	2009-05-05 16:52:13 UTC (rev 6662)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/BroadcastGroupControlUsingCoreTest.java	2009-05-05 17:23:57 UTC (rev 6663)
@@ -66,7 +66,7 @@
          
          public long getBroadcastPeriod()
          {
-            return (Long)proxy.retrieveAttributeValue("BroadcastPeriod");
+            return ((Integer)proxy.retrieveAttributeValue("BroadcastPeriod")).longValue();
          }
 
          public Object[] getConnectorPairs()