[vmkit-commits] [vmkit] r59309 - /vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Nov 14 10:25:10 2008
New Revision: 59309

URL: http://llvm.org/viewvc/llvm-project?rev=59309&view=rev
Log:
Ouuups.



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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Fri Nov 14 10:25:10 2008
@@ -181,9 +181,10 @@
     if (!obj && !isStaticCompiling()) {
       Class* cl = (Class*)classDef;
       classDef->acquire();
-      if (!(cl->getStaticInstance())) {
+      obj = cl->getStaticInstance();
+      if (!obj) {
         // Allocate now so that compiled code can reference it.
-        cl->allocateStaticInstance(JavaThread::get()->getJVM());
+        obj = cl->allocateStaticInstance(JavaThread::get()->getJVM());
       }
       classDef->release();
     }