[vmkit-commits] [vmkit] r69997 - /vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Fri Apr 24 17:28:29 2009
New Revision: 69997

URL: http://llvm.org/viewvc/llvm-project?rev=69997&view=rev
Log:
Update initialization state if a class does not need initialization.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.cpp Fri Apr 24 17:28:29 2009
@@ -906,14 +906,10 @@
       loadExceptions();
       if (!super) ClassArray::initialiseVT(this);
       
-      bool init = needsInitialisationCheck();
+      bool needInit = needsInitialisationCheck();
       
       acquire();
-      if (!init) {
-        setInitializationState(ready);
-      } else {
-        setResolved();
-      }
+      if (needInit) setResolved();
       setOwnerClass(0);
       broadcastClass();
       release();
@@ -1217,6 +1213,7 @@
   
   if (meth) return true;
 
+  setInitializationState(ready);
   return false;
 }