diff options
| author | Mark Wielaard <mark@klomp.org> | 2002-10-11 22:10:37 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2002-10-11 22:10:37 +0000 |
| commit | 9dac635528219ffe0b7a7aef4d355947edd6c48c (patch) | |
| tree | f3e6a4d9f03e1c4c3c0faaf5ccbbb5560b43eef3 /libjava | |
| parent | 45c7cbd930967c9960632245db5f3d6b70be7b79 (diff) | |
| download | gcc-9dac635528219ffe0b7a7aef4d355947edd6c48c.zip gcc-9dac635528219ffe0b7a7aef4d355947edd6c48c.tar.gz gcc-9dac635528219ffe0b7a7aef4d355947edd6c48c.tar.bz2 | |
re PR libgcj/8142 ('$' in class names vs. dlopen 'dynamic string tokens')
Fix for PR libgcj/8142
* java/lang/natClassLoader.cc (findClass): Skip inner classes when
loading native modules.
From-SVN: r58066
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/lang/natClassLoader.cc | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 51a8a41..eaba74a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-10-11 Mark Wielaard <mark@klomp.org> + + Fix for PR libgcj/8142 + * java/lang/natClassLoader.cc (findClass): Skip inner classes when + loading native modules. + 2002-10-10 Michael Koch <konqueror@gmx.de> * javax/swing/AbstractListModel.java diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index c229943..8bff169 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -204,7 +204,14 @@ gnu::gcj::runtime::VMClassLoader::findClass (jstring name) // by `lib-gnu-pkg.so' and `lib-gnu.so'. If loading one of // these causes the class to appear in the cache, then use it. java::lang::StringBuffer *sb = new java::lang::StringBuffer (JvNewStringLatin1("lib-")); - jstring so_base_name = (sb->append (name)->toString ())->replace ('.', '-'); + // Skip inner classes + jstring cn; + jint ci = name->indexOf('$'); + if (ci == -1) + cn = name; + else + cn = name->substring (0, ci); + jstring so_base_name = (sb->append (cn)->toString ())->replace ('.', '-'); // Compare against `3' because that is the length of "lib". while (! klass && so_base_name && so_base_name->length() > 3) |