You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/26 08:53:50 UTC

[3/7] git commit: SLIDER-38 make setting up ip and headless options part of JavaCommandLineBuilder, "builder" style

SLIDER-38 make setting up ip and headless options part of JavaCommandLineBuilder, "builder" style


Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6ea4350e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6ea4350e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6ea4350e

Branch: refs/heads/develop
Commit: 6ea4350e22bf0f1d1305b628a42a327befb4b997
Parents: a129707
Author: Steve Loughran <st...@apache.org>
Authored: Sat May 24 14:19:02 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Sat May 24 14:19:02 2014 +0100

----------------------------------------------------------------------
 .../apache/slider/core/launch/JavaCommandLineBuilder.java | 10 ++++++++++
 .../slider/providers/slideram/SliderAMClientProvider.java |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6ea4350e/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java b/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
index 8d90225..e8b6eb1 100644
--- a/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
+++ b/slider-core/src/main/java/org/apache/slider/core/launch/JavaCommandLineBuilder.java
@@ -65,4 +65,14 @@ public class JavaCommandLineBuilder extends CommandLineBuilder {
   public void sysprop(String property, String value) {
     add("-D" + property + "=" + value);
   }
+  
+  public JavaCommandLineBuilder forceIPv4() {
+    sysprop("java.net.preferIPv4Stack", "true");
+    return this;
+  }
+  
+  public JavaCommandLineBuilder headless() {
+    sysprop("java.awt.headless", "true");
+    return this;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6ea4350e/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
index e2e0a2d..6b40856 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
@@ -212,8 +212,7 @@ public class SliderAMClientProvider extends AbstractClientProvider implements
     MapOperations sliderAM =
       aggregateConf.getAppConfOperations().getMandatoryComponent(
         SliderKeys.COMPONENT_AM);
-    cmdLine.sysprop("java.net.preferIPv4Stack", "true");
-    cmdLine.sysprop("java.awt.headless", "true");
+    cmdLine.forceIPv4().headless();
     String heap = sliderAM.getOption(RoleKeys.JVM_HEAP,
                                    DEFAULT_JVM_HEAP);
     cmdLine.setJVMHeap(heap);