From ae25391dd2ce3ed676cf015f4e9b0c9c47eb19b6 Mon Sep 17 00:00:00 2001
From: lagergren <none@none>
Date: Tue, 26 Mar 2013 08:42:35 +0100
Subject: 8010706: -Dnashorn.args system property to create command lines to
 wrapped nashorn.jar:s Reviewed-by: hannesw, sundar

---
 src/jdk/nashorn/internal/runtime/options/Options.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/jdk/nashorn')

diff --git a/src/jdk/nashorn/internal/runtime/options/Options.java b/src/jdk/nashorn/internal/runtime/options/Options.java
index 0f30b1a1..3e09fa57 100644
--- a/src/jdk/nashorn/internal/runtime/options/Options.java
+++ b/src/jdk/nashorn/internal/runtime/options/Options.java
@@ -66,6 +66,9 @@ public final class Options {
     /** The options map of enabled options */
     private final TreeMap<String, Option<?>> options;
 
+    /** System property that can be used for command line option propagation */
+    private static final String NASHORN_ARGS_PROPERTY = "nashorn.args";
+
     /**
      * Constructor
      *
@@ -386,6 +389,14 @@ public final class Options {
         final LinkedList<String> argList = new LinkedList<>();
         Collections.addAll(argList, args);
 
+    final String extra = getStringProperty(NASHORN_ARGS_PROPERTY, null);
+    if (extra != null) {
+        final StringTokenizer st = new StringTokenizer(extra);
+        while (st.hasMoreTokens()) {
+        argList.add(st.nextToken());
+        }
+    }
+
         while (!argList.isEmpty()) {
             final String arg = argList.remove(0);
 
-- 
cgit v1.2.3