From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 17 Mar 2007 05:00:07 +0000 (+0000)
Subject: 	* tools/gnu/classpath/tools/javah/Main.java (run): Use class'
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c9f7a46adf94991f2b8371c217c67d4316d9778;p=thirdparty%2Fgcc.git

	* 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 0f68f9194523..120747cca6e7 100644
--- 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 66c37937fa3a..56c7f488a24f 100644
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 250844d1d88b..dfa04c4c9efb 100644
--- 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
           {