diff options
| author | Andrew Haley <aph@redhat.com> | 2006-11-07 20:05:21 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@redhat.com> | 2006-11-07 20:05:21 +0000 |
| commit | 6c84c7a2850a357e788bb87f4a4895992e83d66c (patch) | |
| tree | 7dd839e733c643fc1b7333bfda807b52b02bced6 | |
| parent | 24d78dca9d06622c93103edec145267dc01add22 (diff) | |
2006-11-07 Andrew Haley <aph@redhat.com>gcj-eclipse
* java/lang/VMCompiler.java (compileClass): Revert mistaken
change.
* java/lang/natVMClassLoader.cc (defineClass): Register the new
class with the initiating loader.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcj-eclipse@118566 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/java/lang/VMCompiler.java | 3 | ||||
| -rw-r--r-- | libjava/java/lang/natVMClassLoader.cc | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 0502f1c0429..2b25246f1f6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2006-11-07 Andrew Haley <aph@redhat.com> + + * java/lang/VMCompiler.java (compileClass): Revert mistaken + change. + + * java/lang/natVMClassLoader.cc (defineClass): Register the new + class with the initiating loader. + 2006-11-06 Andrew Haley <aph@redhat.com> * defineclass.cc (prepare_pool_entry): Be careful about which diff --git a/libjava/java/lang/VMCompiler.java b/libjava/java/lang/VMCompiler.java index e0826865a47..789445e4f56 100644 --- a/libjava/java/lang/VMCompiler.java +++ b/libjava/java/lang/VMCompiler.java @@ -187,8 +187,7 @@ final class VMCompiler ProtectionDomain domain) { if (precompiledMapFiles == null - && (! useCompiler || ! canUseCompiler) - || name.startsWith("$Proxy")) + && (! useCompiler || ! canUseCompiler)) return null; byte digest[]; diff --git a/libjava/java/lang/natVMClassLoader.cc b/libjava/java/lang/natVMClassLoader.cc index 95c1f15934c..2db2429c927 100644 --- a/libjava/java/lang/natVMClassLoader.cc +++ b/libjava/java/lang/natVMClassLoader.cc @@ -47,6 +47,9 @@ java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader, jclass klass = VMCompiler::compileClass(loader, name, data, offset, length, pd); + if (klass) + _Jv_RegisterInitiatingLoader (klass, klass->loader); + #ifdef INTERPRETER if (klass == NULL) { |