add custom jvm arguments before trinidad's script

calavera · Apr 5, 2011 · 4fd0238 · 4fd0238
1 parent fd26df3
commit 4fd0238
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/main/java/org/jruby/trinidad/TrinidadDaemon.java b/src/main/java/org/jruby/trinidad/TrinidadDaemon.java
@@ -93,16 +93,20 @@ private JavaVMArguments configureJVMArguments() throws Exception {
 
         JavaVMArguments currentJVMArgs = JavaVMArguments.current();
         for (String arg : currentJVMArgs) {
+            if (arg.startsWith("-Xbootclasspath")) {
+                //add here the custom arguments, otherwhise are added after
+                //trinidad script and break optionParser
+                for (String custom : jvmArgs) {
+                    args.add(custom);
+                }
+            }
+
             // I don't understand this hack but without it the daemon goes off, could be others
             if (!arg.endsWith("java")) {
                 args.add(arg);
             }
         }
 
-        for (String arg : jvmArgs) {
-            args.add(arg);
-        }
-
         return args;
     }
 }