[jboss-cvs] JBossAS SVN: r99918 - branches/JBPAPP_4_2_0_GA_CP/testsuite.

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

Author: rachmatowicz at jboss.com
Date: 2010-01-25 15:19:21 -0500 (Mon, 25 Jan 2010)
New Revision: 99918

Modified:
   branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
Log:
Update IP stack preference to use IPv4 as the default when running the testsuite (JBPAPP-2997)

Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2010-01-25 19:48:27 UTC (rev 99917)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2010-01-25 20:19:21 UTC (rev 99918)
@@ -94,14 +94,20 @@
 
   <!-- IP stack preference -->
   <!-- The value of java.net.preferIPv4Stack determines which IP version to test against. -->
-  <!-- Setting the system property to true forces use of IPv4 IP stack in the JVM. -->
-  <!-- Setting the system property to false, or not setting at all, forces use of IPv6 stack -->
-  <!-- This ant property is used in server-config.xml when starting all server configurations -->  
+  <!-- Setting the system property to true, or not setting at all, forces use of IPv4 IP stack in the JVM. -->
+  <!--, or not setting at all,  Setting the system property to falseforces use of IPv6 stack -->
+  <!-- This ant property is used in server-config.xml when starting all server configurations --> 
+  <!-- It is also used on the client side targets to make sure that client and server are using the same stack -->
   <condition property="java.net.preferIPv4Stack" value="true" else="false">
-    <and>
-      <isset property="${java.net.preferIPv4Stack}"/>
-      <istrue value="${java.net.preferIPv4Stack}"/>
-    </and>
+	<or>
+	  <not>
+	    <isset property="java.net.preferIPv4Stack"/>
+	  </not>
+	  <and>
+	    <isset property="java.net.preferIPv4Stack"/>
+	    <istrue value="${java.net.preferIPv4Stack}"/>
+	  </and>
+	</or>
   </condition>
   <!-- IP address preference -->
   <!-- The value of java.net.preferIPv6Addresses determines which version of an IP address to return -->