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 b1da426ab3dd..83eac3f8d0d8 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
zc-lRXO-K|_6otQ&e>12IX4nwgvYMIv%_1m}S_DZ!5Jnb6FbHMKC~GK73M0%4Uq%=$
z`lHZdMqC((F*7ALwkRiUQ%zb!n+(EbZM<f<dH3G;-nr-S&4%Z~v9`dfMso3j){d~Q
zd6*4*pQzAv1qKQ#6U6#xc3Xl+eDfP)Kn`_wwz9@O3^wdP#i-7Z(pl1qFs*ZBb)I>(
z^G6Zo>Y_?@Q02PBCR0TyS~Q`a%{E!5QC&fJR7S%7tYD?&YD1+bPOD4TEL0OYiW4V~
zUfTb6Eo@Z+5Ba2MRKIP=C(RBeNm4+TGQF}_50A|vXgijCUN8G}o6nMRY*Fc=p(<S+
z%7ntY&`qAMQ=}V|=qBarAt=Xo-Lmz)?9?50tB-xUON;Ii(S17ffZKY+Q}r{b0bb~t
z;fV51gM8Kyzcp+qqK0BbK8vwhFaM#qOtA&?FQf45uTm~vIi{rRtU6vYj#qCCM+(0t
zEXmuR>gN^j?Q#;I(p2aJb(&(E)do$oM<3lpbtdqMLVaPqGSuiR^_pRqW;tN>kiKzL
a-#Ml%C-uWk)^vD(8j(4Q^~)Wu?OXsvpo2F6

delta 502
zc-lRWOGp$@6o$V)N1MTsVZ>gL+j7S8l|fK3)S@UV+8EU$f?=dqE`lb;C?zmxin5Cp
zK}Czu%wi-VQSvd_3rTw*M9%o2jg||cRYKqqrOiG6x%dA6cg|dNI+}`yiXwRMf!6i1
z>BK8a4!6qVlA&jAclcD`@0JvhLzSJiY;f)2$mR2-6=zr%7*T?(>iMmU{IUL@F3GRs
zTB8QGnInOJDVS=uTW3nIbrs=NfI(eh6@@IQPyI&NPf$r+w_zSox1wsu(EtPF(n5Si
z#g4E;gLug!%|W$WU>?KlQQG>|WLc{>_Uh${5yKX;j2-%qy<ym8=i4Qx>nSZ$)63b?
zsAAX1RT96kgZ6EsZW7ilcB$FoZ?jh|9MD~k>K-xOC!vQl>JfMJm^QW2sW!Uxl#l9Q
zR4>RV#k{&~!wz}Wt$=!LlwQ}lbyEGVx$JCk2%im6sCTT_d*gj@`Q^`xKiTaF0gY0u
z&s6CPJFQ0al|%aG#>yu`-^texHfx*;WvEt`eVX8y)svd!w5B+tY0l}V%TzS_W^D0U
L3iQj>RyHjH6G4B<

diff --git a/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java b/libjava/classpath/tools/gnu/classpath/tools/javah/Main.java
index 894a5c4d2c09..2bea36cafc28 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.47.3