[jboss-cvs] JBossAS SVN: r106400 - branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster.

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

Author: pferraro
Date: 2010-07-02 10:24:02 -0400 (Fri, 02 Jul 2010)
New Revision: 106400

Modified:
   branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java
   branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java
Log:
Need to backpedal test for compatibility w/mod_cluster 1.0.x

Modified: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java	2010-07-02 14:12:40 UTC (rev 106399)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster/HAModClusterServiceTestCase.java	2010-07-02 14:24:02 UTC (rev 106400)
@@ -105,7 +105,6 @@
       }
       
       String[] hosts = this.getServers();
-      ByteBuffer buffer = ByteBuffer.allocate(InetAddress.getLocalHost().getAddress().length + (Integer.SIZE / Byte.SIZE) + ENGINE.getBytes().length);         
       
       for (int i = 0; i < hosts.length; ++i)
       {
@@ -113,12 +112,7 @@
          
          requests.clear();
 
-         buffer.clear();
-         buffer.put(InetAddress.getByName(hosts[i]).getAddress());
-         buffer.putInt(PORT);
-         buffer.put(ENGINE.getBytes());
-
-         String jvmRoute = UUID.nameUUIDFromBytes(buffer.array()).toString();
+         String jvmRoute = host;
          
          count = this.proxy.getRequests(jvmRoute).drainTo(requests);
 

Modified: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java	2010-07-02 14:12:40 UTC (rev 106399)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/mod_cluster/ModClusterServiceTestCase.java	2010-07-02 14:24:02 UTC (rev 106400)
@@ -80,7 +80,6 @@
       ObjectName name = ObjectName.getInstance("jboss.web:service=ModCluster");
       
       String[] hosts = this.getServers();
-      ByteBuffer buffer = ByteBuffer.allocate(InetAddress.getLocalHost().getAddress().length + (Integer.SIZE / Byte.SIZE) + ENGINE.getBytes().length);         
       
       for (int i = 0; i < hosts.length; ++i)
       {
@@ -114,12 +113,7 @@
          
          requests.clear();
          
-         buffer.clear();
-         buffer.put(InetAddress.getByName(hosts[i]).getAddress());
-         buffer.putInt(PORT);
-         buffer.put(ENGINE.getBytes());
-
-         String jvmRoute = UUID.nameUUIDFromBytes(buffer.array()).toString();
+         String jvmRoute = host;
          
          count = this.proxy.getRequests(jvmRoute).drainTo(requests);