Mercurial > hg > truffle

diff src/share/vm/runtime/thread.cpp @ 12252:06ae47d9d088

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author tschatzl
date Thu, 19 Sep 2013 09:26:08 +0200
parents b89a1a870965 40136aa2cdb1
children 179cd89fb279
line wrap: on
line diff
--- a/src/share/vm/runtime/thread.cpp	Wed Sep 18 12:52:15 2013 -0400
+++ b/src/share/vm/runtime/thread.cpp	Thu Sep 19 09:26:08 2013 +0200
@@ -3331,6 +3331,11 @@
   jint parse_result = Arguments::parse(args);
   if (parse_result != JNI_OK) return parse_result;
 
+  os::init_before_ergo();
+
+  jint ergo_result = Arguments::apply_ergo();
+  if (ergo_result != JNI_OK) return ergo_result;
+
   if (PauseAtStartup) {
     os::pause();
   }