From 45af64a72b4794566c2f9938ca6d4714c1784e62 Mon Sep 17 00:00:00 2001
From: Andrew Haley <aph@redhat.com>
Date: Tue, 18 Dec 2012 09:57:48 +0000
Subject: [PATCH] Main.java (parseClasses): Don't scan inner classes if our
 item is a file.

2012-12-17  Andrew Haley  <aph@redhat.com>

	* tools/gnu/classpath/tools/javah/Main.java (parseClasses): Don't
	scan inner classes if our item is a file.

From-SVN: r194573
---
 libjava/classpath/ChangeLog                   |   5 +++++
 .../gnu/classpath/tools/javah/Main.class      | Bin 12769 -> 12780 bytes
 .../tools/gnu/classpath/tools/javah/Main.java |  19 ++++++++++--------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index b1da426ab3d..83eac3f8d0d 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-17  Andrew Haley  <aph@redhat.com>
+
+	* tools/gnu/classpath/tools/javah/Main.java (parseClasses): Don't
+	scan inner classes if our item is a file.
+
 2012-09-14  David Edelsohn  <dje.gcc@gmail.com>
 
 	* configure: Regenerated.
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 709b6d012628dcad7271dfd62901674e500c3789..12f1a7d9813f91f4be90cfa4bbf08708ac7aadee 100644
GIT binary patch
delta 524
zcmX|-OGp$@6o$V)Uo)r-X4nwgvYMHEW)T!fErO&V2qOz37=*HAlr@wkg%M_jHzSM|
zy(qMp5f=tx%uI=mEy_vTRFl@wCWCNU8;==o?m72y{{O$<Y<MmlYYVJuBo{Ae?Fj3d
zhuN_Ai3(j;V4$EfL9CBvw<UPQH@`6k<WOg8D{I`tV8i}XjOq+2oh7XZ(>h01=b2YK
ze-u%!E~-=qRjx~HvZ)9~izd{w*>=`xR96rlm65PFD_AMH+ED3<)9TVS3)Mu9;>5|L
zm-hc%3tN@ILp~`Q)o%*<q}ib)NeakPrdM|B;jvi+O=HRD^|DX5`7BM2El#><s7hCd
zGNG_8bd#s+6zK*fx=Fcu2+FZtw@kj5ow~zr^|4QPY0*6*x=)85a9fXfs(uDFzzaPy
z98unBkk1<8w}uTx)KHAbXWw0|m;X>)rr3h{mr?ljS1A{-98=PDRvj-H$E!DnBZXfR
zmgH?u_4A7Nb~uSoX)5%AI!&?7YJ;ZPqmOQ)IurOrp}w$Q8EW*Edd;v)vmCH`NZ&ZB
a?;KN>lltK%YdX9?jr<(N`sEJSb}j%!po2F6

delta 502
zcmX|-O-K|_6otQ&qs`#NFw!sNwwkfj)F7xBYEcv=ZHj6U!7x&*7C{qZloA*;N!i1U
zprS=+W-_9XD5XxCg{1uuNX=-{#-A2JD+Qq|N}G4jd5?R(`|j`PR5TS2t&QNp2inlf
zmea4;cC1+*mkhmd`@&}f^V?HE4rO*$vB|ZDBiApJR-6%CVN?mSs%B1C`D=br*W}kJ
zty2x<){(%!6ifxX%$d?_-9&g5U_dumMF9(Xqdp@XBB-Qp+c1x~xS~#wqkj6yrIGlG
zidC{(19-_J%@MU)U>+mvSK9n)vaHuzd-d|nh+&Ic#t#0+)*E)Yb7-m4^%NDWu5+d+
zs@N@ZmBepT1Xa&w-65>I>{Wxs-{XK9Ijkm*>j5!6B%#OD>IwJtlomD9p%%LJoDXVa
zOzmWp;*YxQhi&qxTLJah26|n`j!E^ohT;psL3|pbK=0V7VdK4b`6Vw4Kicgm0gX|p
zPn791d#pzEg`@iFzLiXb#>v-rw(19^%21&!2Q|S-t7kOHIsN3krnsbEE>l|To3?$=
Lutu}4YG>U)6G4B<

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index 894a5c4d2c0..2bea36cafc2 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
@@ -370,16 +370,19 @@ public class Main
         results.put(filename, klass);
         parsed.add(item.toString());
 
-        // Check to see if there are inner classes to also parse
-        Iterator<?> innerClasses = klass.innerClasses.iterator();
-        HashSet<Object> innerNames = new HashSet<Object>();
-        while (innerClasses.hasNext())
+        if (! (item instanceof File))
           {
-            String innerName = ((InnerClassNode) innerClasses.next()).name;
-            if (!parsed.contains(innerName))
-              innerNames.add(innerName);
+            // Check to see if there are inner classes to also parse
+            Iterator<?> innerClasses = klass.innerClasses.iterator();
+            HashSet<Object> innerNames = new HashSet<Object>();
+            while (innerClasses.hasNext())
+              {
+                String innerName = ((InnerClassNode) innerClasses.next()).name;
+                if (!parsed.contains(innerName))
+                  innerNames.add(innerName);
+              }
+            results.putAll(parseClasses(innerNames.iterator()));
           }
-        results.putAll(parseClasses(innerNames.iterator()));
       }
     return results;
   }
-- 
2.30.2