[jboss-cvs] JBoss Messaging SVN: r7981 - branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools.

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

Author: gaohoward
Date: 2010-03-23 03:14:19 -0400 (Tue, 23 Mar 2010)
New Revision: 7981

Modified:
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
Log:
add support for forcing ipv4 option force.ipv4


Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2010-03-23 07:10:38 UTC (rev 7980)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2010-03-23 07:14:19 UTC (rev 7981)
@@ -524,17 +524,24 @@
       // As there is a problem with Multicast and JGroups on Linux (in certain JDKs)
       // The stack introduced by multiplexer might fail under Linux if we don't have this
       
+      String propIpv4 = System.getProperty("force.ipv4");
+      log.info("force.ipv4 prop: " + propIpv4);
+      boolean forceIPv4 = false;
+      if (propIpv4 != null)
+      {
+         forceIPv4 = propIpv4.trim().equals("true");
+      }
+      log.info("forcing ipv4 setting: " + forceIPv4);
       
       if (System.getProperty("os.name").equals("Linux") )
       {
           //most JDK's >= 6 work fine with ipv6
          String version = System.getProperty("java.version");
          int v = Character.getNumericValue(version.charAt(2));
-         if( v < 6) {
+         if( v < 6 || forceIPv4) {
              log.info("Setting java.net.preferIPv4Stack=true" );
              sb.append(" -Djava.net.preferIPv4Stack=true ");
          }
-
       }
 
       sb.append("org.jboss.test.messaging.tools.container.RMITestServer");