[jboss-cvs] javassist SVN: r575 - trunk/src/main/javassist.

[jboss-cvs-commits at lists.jboss.org]

Author: chiba
Date: 2010-10-05 05:42:29 -0400 (Tue, 05 Oct 2010)
New Revision: 575

Modified:
   trunk/src/main/javassist/CtClassType.java
Log:
fixed JASSIST-121

Modified: trunk/src/main/javassist/CtClassType.java
===================================================================
--- trunk/src/main/javassist/CtClassType.java	2010-09-14 14:38:43 UTC (rev 574)
+++ trunk/src/main/javassist/CtClassType.java	2010-10-05 09:42:29 UTC (rev 575)
@@ -401,20 +401,17 @@
         if (ica == null)
             return new CtClass[0];
 
-        String thisName = cf.getName();
+        String thisName = cf.getName() + "$";
         int n = ica.tableLength();
         ArrayList list = new ArrayList(n);
         for (int i = 0; i < n; i++) {
-            String outer = ica.outerClass(i);
-            /*
-             * If a nested class is local or anonymous,
-             * the outer_class_info_index is 0.
-             */
-            if (outer == null || outer.equals(thisName)) {
-                String inner = ica.innerClass(i);
-                if (inner != null)
-                    list.add(classPool.get(inner));
-            }
+            String name = ica.innerClass(i);
+            if (name != null)
+                if (name.startsWith(thisName)) {
+                    // if it is an immediate nested class
+                    if (name.lastIndexOf('$') < thisName.length())
+                        list.add(classPool.get(name));
+                }
         }
 
         return (CtClass[])list.toArray(new CtClass[list.size()]);