Merge pull request #804 from sonatype/NEXUS-5660_preferIPv4Stack

REVIEW: NEXUS-5660 add java.net.preferIPv4Stack system property via nexus.properties
sonatype · Apr 12, 2013 · feb2786 · feb2786
2 parents 86cde86 + 14d4157
commit feb2786
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/nexus-oss-webapp/src/main/resources/content/bin/jsw/conf/wrapper.conf b/nexus-oss-webapp/src/main/resources/content/bin/jsw/conf/wrapper.conf
@@ -26,11 +26,12 @@ wrapper.java.classpath.3=./conf/
 wrapper.java.library.path.1=bin/jsw/lib
 
 # Additional JVM parameters (tune if needed, but match the sequence of numbers!)
-#wrapper.java.additional.1=-Xdebug
-#wrapper.java.additional.2=-Xnoagent
-#wrapper.java.additional.3=-Djava.compiler=NONE
-#wrapper.java.additional.4=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#wrapper.java.additional.5=-XX:+HeapDumpOnOutOfMemoryError
+wrapper.java.additional.1=-Djava.net.preferIPv4Stack=true
+#wrapper.java.additional.2=-Xdebug
+#wrapper.java.additional.3=-Xnoagent
+#wrapper.java.additional.4=-Djava.compiler=NONE
+#wrapper.java.additional.5=-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#wrapper.java.additional.6=-XX:+HeapDumpOnOutOfMemoryError
 
 wrapper.app.parameter.1=./conf/jetty.xml
 

diff --git a/...ncher/src/main/java/org/sonatype/nexus/integrationtests/AbstractNexusIntegrationTest.java b/...ncher/src/main/java/org/sonatype/nexus/integrationtests/AbstractNexusIntegrationTest.java
@@ -164,6 +164,8 @@ public abstract class AbstractNexusIntegrationTest
 
         // guice finalizer turned OFF
         System.setProperty( "guice.executor.class", "NONE" );
+        // NEXUS-5660 test with ipv4 as app runs with this set now
+        System.setProperty( "java.net.preferIPv4Stack", "true" );
     }
 
     static