* tools/gnu/classpath/tools/javah/Main.java (run): Use class'

	name in File case.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123012 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 0f68f91945233994bdaed0b0b066a049b3369397..120747cca6e7613b91750ce3dde0972f805d7dda 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-16  Tom Tromey  <tromey@redhat.com>
+
+       * tools/gnu/classpath/tools/javah/Main.java (run): Use class'
+       name in File case.
+
 2007-03-16  Tom Tromey  <tromey@redhat.com>
 
        * tools/gnu/classpath/tools/javah/JniStubPrinter.java

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class
index 66c37937fa3ae25fd3a04a59120a0b18f24cb7dc..56c7f488a24fb8b749a30b936a64299e3df668f0 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/javah/Main.class differ

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index 250844d1d88b779d912616bb44cb547f62331916..dfa04c4c9efb4a2284052fbd40ad570190d1941b 100644 (file)
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
@@ -392,8 +392,8 @@ public class Main
             // Load class from file.
             if (verbose)
               System.err.println("[reading file " + item + "]");
-           filename = (File) item;
-            klass = getClass(filename);
+            klass = getClass((File) item);
+           filename = new File(klass.name);
           }
         else
           {