[vmkit-commits] [vmkit] r67301 - /vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Thu Mar 19 05:27:28 2009
New Revision: 67301

URL: http://llvm.org/viewvc/llvm-project?rev=67301&view=rev
Log:
Call analyseClasspathEnv functin after creation of array classes, so
that the Reader functions can safely create Java array bytes.


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

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

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmClassLoader.cpp Thu Mar 19 05:27:28 2009
@@ -80,7 +80,6 @@
     libClasspathEnv = GNUClasspathLibs;
   }
   
-  analyseClasspathEnv(bootClasspathEnv);
   
   upcalls = new(allocator) Classpath();
   bootstrapLoader = this;
@@ -155,6 +154,12 @@
   arrayTable[JavaArray::T_FLOAT - 4] = upcalls->ArrayOfFloat;
   arrayTable[JavaArray::T_LONG - 4] = upcalls->ArrayOfLong;
   arrayTable[JavaArray::T_DOUBLE - 4] = upcalls->ArrayOfDouble;
+  
+  // Analyse the boot classpath to locate java/lang/Object. Since the
+  // analyseClasspathEnv function may require to create a Java byte array to
+  // hold the .zip file, we call the function after creation of the
+  // array classes.
+  analyseClasspathEnv(bootClasspathEnv);
 
 
   // Now that native types have been loaded, try to find if we have a