[vmkit-commits] [vmkit] r59627 - /vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Nov 19 06:50:34 2008
New Revision: 59627

URL: http://llvm.org/viewvc/llvm-project?rev=59627&view=rev
Log:
Initialise threads only if we're the first isolate, in a SERVICE
environment.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp?rev=59627&r1=59626&r2=59627&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/Jnjvm.cpp Wed Nov 19 06:50:34 2008
@@ -801,10 +801,16 @@
   LOAD_CLASS(upcalls->ClassNotFoundException); 
 #undef LOAD_CLASS
 
+#ifdef SERVICE
+  if (!IsolateID)
+#endif
   mapInitialThread();
   loadAppClassLoader();
   JavaObject* obj = JavaThread::currentThread();
   JavaObject* javaLoader = appClassLoader->getJavaClassLoader();
+#ifdef SERVICE
+  if (!IsolateID)
+#endif
   upcalls->setContextClassLoader->invokeIntSpecial(this, upcalls->newThread,
                                                    obj, javaLoader);
   // load and initialise math since it is responsible for dlopen'ing