[hornetq-commits] JBoss hornetq SVN: r10239 - in branches/HORNETQ-316/tests/src/org/hornetq/tests: util and 1 other directory.

[do-not-reply at jboss.org]

Author: igarashitm
Date: 2011-02-22 01:31:16 -0500 (Tue, 22 Feb 2011)
New Revision: 10239

Modified:
   branches/HORNETQ-316/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
   branches/HORNETQ-316/tests/src/org/hornetq/tests/util/UnitTestCase.java
Log:
fixed easy NPE


Modified: branches/HORNETQ-316/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/HORNETQ-316/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-02-21 22:05:26 UTC (rev 10238)
+++ branches/HORNETQ-316/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2011-02-22 06:31:16 UTC (rev 10239)
@@ -1642,8 +1642,8 @@
          pairs = new ArrayList<TransportConfiguration>();
          pairs.add(serverTotc);
       }
-
-      DiscoveryGroupConfiguration groupConf = createStaticDiscoveryGroupConfiguration(pairs.toArray(new TransportConfiguration[0]));
+      
+      DiscoveryGroupConfiguration groupConf = createStaticDiscoveryGroupConfiguration(pairs!=null ? pairs.toArray(new TransportConfiguration[0]) : null);
       serverFrom.getConfiguration().getDiscoveryGroupConfigurations().put(groupConf.getName(), groupConf);
       
       ClusterConnectionConfiguration clusterConf = new ClusterConnectionConfiguration(name,

Modified: branches/HORNETQ-316/tests/src/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- branches/HORNETQ-316/tests/src/org/hornetq/tests/util/UnitTestCase.java	2011-02-21 22:05:26 UTC (rev 10238)
+++ branches/HORNETQ-316/tests/src/org/hornetq/tests/util/UnitTestCase.java	2011-02-22 06:31:16 UTC (rev 10239)
@@ -265,7 +265,7 @@
    protected static DiscoveryGroupConfiguration createStaticDiscoveryGroupConfiguration(TransportConfiguration... connectors)
    {
       Map<String,Object> params = new HashMap<String,Object>();
-      params.put(DiscoveryGroupConstants.STATIC_CONNECTORS_LIST_NAME, Arrays.asList(connectors));
+      params.put(DiscoveryGroupConstants.STATIC_CONNECTORS_LIST_NAME, connectors != null ? Arrays.asList(connectors) : null);
       return new DiscoveryGroupConfiguration(StaticServerLocatorImpl.class.getName(),
                                              params,
                                              UUIDGenerator.getInstance().generateStringUUID());