--- a/JavaVM.st Tue Nov 10 14:29:36 1998 +0000
+++ b/JavaVM.st Tue Nov 10 14:33:35 1998 +0000
@@ -734,6 +734,16 @@
Java initAllStaticFields.
Java markAllClassesUninitialized.
+ "/ force re-resolving;
+ "/ otherwise, class-inits would not be called
+ "/ by resolver ... (sigh)
+
+ JavaMethod allSubInstancesDo:[:m |
+ m checked:false.
+ m code:nil.
+ ].
+ ObjectMemory flushCaches. "/ sigh - must flush inline caches.
+
self initializeSimulatedLibs. "/ < jdk 1.2
self initializeSimulatedNativeLibs. "/ >= jdk 1.2
self initializeOpenFileTable.
@@ -741,7 +751,6 @@
self initializeBaseClasses.
self initializePrimitiveClasses.
- (Java classForName:'java.lang.System') classInit.
Java initSystemClass.
ObjectMemory addDependent:self.
@@ -752,7 +761,7 @@
"
"Created: / 3.1.1998 / 21:29:09 / cg"
- "Modified: / 4.2.1998 / 23:08:06 / cg"
+ "Modified: / 10.11.1998 / 12:43:51 / cg"
!
initializeVMIfNoEventThreadRunning
@@ -1520,11 +1529,11 @@
throwClassNotFoundException:className
self
- throwExceptionClassName:'java.lang.ClassNotFoundException'
- withMessage:'no such class: ' , className
+ throwExceptionClassName:'java.lang.ClassNotFoundException'
+ withMessage:'no such class: ' , className
"Created: / 4.1.1998 / 22:26:09 / cg"
- "Modified: / 7.1.1998 / 15:25:58 / cg"
+ "Modified: / 10.11.1998 / 13:20:31 / cg"
!
throwException:aJavaException
@@ -4271,22 +4280,22 @@
out nextPutLine:'JAVA: stackTrace:'.
contextList do:[:con |
- out
- nextPutAll:' ';
- nextPutAll:(con method javaClass fullName);
- nextPutAll:'.';
- nextPutAll:(con method selector);
- nextPutAll:' [';
- nextPutAll:(con method javaClass sourceFile);
- nextPutAll:' ';
- nextPutAll:(con lineNumber displayString);
- nextPutAll:']'.
- out cr
+ out
+ nextPutAll:' ';
+ nextPutAll:(con method javaClass fullName);
+ nextPutAll:'.';
+ nextPutAll:(con method selector);
+ nextPutAll:' [';
+ nextPutAll:(con method javaClass sourceFile);
+ nextPutAll:' ';
+ nextPutAll:(con quickLineNumber displayString);
+ nextPutAll:']'.
+ out cr
].
out nextPutLine:'----------------------------------------------------'
"Created: / 4.1.1998 / 14:27:40 / cg"
- "Modified: / 15.1.1998 / 00:14:40 / cg"
+ "Modified: / 10.11.1998 / 14:19:32 / cg"
! !
!JavaVM class methodsFor:'native - java.lang - jdk1.2'!
@@ -8263,6 +8272,6 @@
!JavaVM class methodsFor:'documentation'!
version
- ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.56 1998/11/10 00:21:22 cg Exp $'
+ ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.57 1998/11/10 14:32:21 cg Exp $'
! !
JavaVM initialize!