diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3bd83c7acff..df6c6c1737d 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2002-02-04  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+	* parse.y (java_expand_classes): Fix typo in static field loop.
+
 2002-02-02  Richard Henderson  <rth@redhat.com>
 
 	* class.c (add_field): Mark static fields external.
diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 328a18e3d12..59559d3da6c 100644
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -9015,6 +9015,7 @@ java_expand_classes ()
   for (cur_ctxp = ctxp_for_generation; cur_ctxp; cur_ctxp = cur_ctxp->next)
     {
       tree current;
+      ctxp = cur_ctxp;
       for (current = ctxp->class_list; current; current = TREE_CHAIN (current))
 	{
 	  tree class = TREE_TYPE (current);