diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7afd69d28f1..2df70b6caa8 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-21  Tom Tromey  <tromey@redhat.com>
+
+	* parse.y (build_access_to_thisn): Stop when FROM is not an inner
+	class.
+
 2002-03-21  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* cp-tree.h (pushdecl, pushlevel, poplevel, set_block,
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 8f88c5d6724..eecb8add7f8 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -8548,7 +8548,7 @@ build_access_to_thisn (from, to, lc)
 {
   tree access = NULL_TREE;
 
-  while (from != to)
+  while (from != to && PURE_INNER_CLASS_TYPE_P (from))
     {
       if (!access)
         {
@@ -8568,8 +8568,8 @@ build_access_to_thisn (from, to, lc)
 	  access = make_qualified_primary (cn, access, lc);
 	}
 
-      /* if FROM isn't an inter class, that's fine, we've done
-         enough. What we're looking for can be accessed from there. */
+      /* If FROM isn't an inner class, that's fine, we've done enough.
+         What we're looking for can be accessed from there.  */
       from = DECL_CONTEXT (TYPE_NAME (from));
       if (!from)
 	break;