Permalink
Browse files

add custom jvm arguments before trinidad's script

  • Loading branch information...
1 parent fd26df3 commit 4fd0238549f9625550cf880f8f8ed16181d2ceef @calavera committed Apr 5, 2011
Showing with 8 additions and 4 deletions.
  1. +8 −4 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;
}
}

0 comments on commit 4fd0238

Please sign in to comment.