Index: javax/swing/ViewportLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ViewportLayout.java,v
retrieving revision 1.17
diff -u -r1.17 ViewportLayout.java
--- javax/swing/ViewportLayout.java	19 Oct 2005 15:45:05 -0000	1.17
+++ javax/swing/ViewportLayout.java	26 Oct 2005 19:34:19 -0000
@@ -145,7 +145,7 @@
                                      portBounds.y + portBounds.height);
         
     // vertical implementation of the above rules
-    if (portBounds.height >= viewPref.height)
+    if (portBounds.height >= viewMinimum.height)
       {
         portBounds.y = 0;
         if ( !(view instanceof Scrollable) || ((Scrollable)view).getScrollableTracksViewportHeight())
@@ -153,13 +153,14 @@
       }
     else
       {
+        viewPref.height = viewMinimum.height;
         int overextension = portLowerRight.y - viewPref.height;
         if (overextension > 0)
             portBounds.y -= overextension;
       }
 
     // horizontal implementation of the above rules
-    if (portBounds.width >= viewPref.width)
+    if (portBounds.width >= viewMinimum.width)
       {
         portBounds.x = 0;
         if ( !(view instanceof Scrollable) || ((Scrollable)view).getScrollableTracksViewportWidth())
@@ -167,6 +168,7 @@
       }
     else
       {
+        viewPref.width = viewMinimum.width;
         int overextension = portLowerRight.x - viewPref.width;
         if (overextension > 0)
             portBounds.x -= overextension;