diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2009-03-25 12:24:50 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2009-03-25 12:24:50 +0000 |
| commit | ecb8c048818970fc8bf56ce27962acc1712e5f03 (patch) | |
| tree | 2e4cd70548d482170b6c240bca6d0322813bc98e | |
| parent | 0a7f6ac8bee428e35b432a1e6c224998e37f4e59 (diff) | |
| download | classpath-ecb8c048818970fc8bf56ce27962acc1712e5f03.tar.gz | |
Fix for PR39408.
2009-03-26 Andrew John Hughes <ahughes@redhat.com>
PR classpath/39408:
* tools/gnu/classpath/tools/javah/ClassWrapper.java:
(linkSupers()): Make package-private.
* tools/gnu/classpath/tools/javah/JniIncludePrinter.java:
(writeFields(ClassWrapper, JniPrintStream)):
Link in data from superclass before searching for fields.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | tools/gnu/classpath/tools/javah/ClassWrapper.java | 2 | ||||
| -rw-r--r-- | tools/gnu/classpath/tools/javah/JniIncludePrinter.java | 2 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,12 @@ +2009-03-26 Andrew John Hughes <ahughes@redhat.com> + + PR classpath/39408: + * tools/gnu/classpath/tools/javah/ClassWrapper.java: + (linkSupers()): Make package-private. + * tools/gnu/classpath/tools/javah/JniIncludePrinter.java: + (writeFields(ClassWrapper, JniPrintStream)): + Link in data from superclass before searching for fields. + 2009-03-20 Andrew John Hughes <ahughes@redhat.com> * tools/gnu/classpath/tools/javah/ClassWrapper.java, diff --git a/tools/gnu/classpath/tools/javah/ClassWrapper.java b/tools/gnu/classpath/tools/javah/ClassWrapper.java index 2fb73772f..1f4d26a23 100644 --- a/tools/gnu/classpath/tools/javah/ClassWrapper.java +++ b/tools/gnu/classpath/tools/javah/ClassWrapper.java @@ -104,7 +104,7 @@ public class ClassWrapper return false; } - private void linkSupers() throws IOException + void linkSupers() throws IOException { if (superName == null) { diff --git a/tools/gnu/classpath/tools/javah/JniIncludePrinter.java b/tools/gnu/classpath/tools/javah/JniIncludePrinter.java index 856acf3e6..bbede8ea0 100644 --- a/tools/gnu/classpath/tools/javah/JniIncludePrinter.java +++ b/tools/gnu/classpath/tools/javah/JniIncludePrinter.java @@ -59,7 +59,9 @@ public class JniIncludePrinter } private void writeFields(ClassWrapper klass, JniPrintStream out) + throws IOException { + klass.linkSupers(); boolean wroteAny = false; for (; klass != null; klass = klass.superClass) { |