Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.19
diff -u -r1.19 Component.java
--- java/awt/Component.java	2 Mar 2003 14:42:13 -0000	1.19
+++ java/awt/Component.java	17 Jul 2003 15:33:01 -0000
@@ -1452,12 +1452,7 @@
    */
   public Dimension getPreferredSize()
   {
-    if (prefSize == null)
-      if (peer == null)
-	return new Dimension(width, height);
-      else 
-        prefSize = peer.getPreferredSize();
-    return prefSize;
+    return preferredSize();
   }
 
   /**
@@ -1468,7 +1463,12 @@
    */
   public Dimension preferredSize()
   {
-    return getPreferredSize();
+    if (prefSize == null)
+      if (peer == null)
+	return new Dimension(width, height);
+      else 
+        prefSize = peer.getPreferredSize();
+    return prefSize;
   }
 
   /**
@@ -1480,10 +1480,7 @@
    */
   public Dimension getMinimumSize()
   {
-    if (minSize == null)
-      minSize = (peer != null ? peer.getMinimumSize()
-                 : new Dimension(width, height));
-    return minSize;
+    return minimumSize();
   }
 
   /**
@@ -1494,7 +1491,10 @@
    */
   public Dimension minimumSize()
   {
-    return getMinimumSize();
+    if (minSize == null)
+      minSize = (peer != null ? peer.getMinimumSize()
+                 : new Dimension(width, height));
+    return minSize;
   }
 
   /**
Index: java/awt/Container.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.20
diff -u -r1.20 Container.java
--- java/awt/Container.java	1 Jul 2003 08:34:28 -0000	1.20
+++ java/awt/Container.java	17 Jul 2003 15:33:02 -0000
@@ -473,7 +473,7 @@
   {
     synchronized (getTreeLock ())
       {
-        if (! isValid())
+        if (! isValid() && peer != null)
           {
             validateTree();
           }