# HG changeset patch
# User lana
# Date 1285699425 25200
# Node ID ecf7952e13ef0c3e64fff91c6e982a01165ee549
# Parent  f6fc8cb4cef7103cd3d5e85b099f3f4d65bb6edf# Parent  64ecd501905b2aead80b99423e328acbdf4bb356
Merge

diff -r f6fc8cb4cef7 -r ecf7952e13ef jdk/src/share/classes/java/awt/Dialog.java
--- a/jdk/src/share/classes/java/awt/Dialog.java	Tue Sep 28 00:20:15 2010 -0700
+++ b/jdk/src/share/classes/java/awt/Dialog.java	Tue Sep 28 11:43:45 2010 -0700
@@ -1068,7 +1068,7 @@
                     modalityPushed();
                     try {
                         EventQueue eventQueue = Toolkit.getDefaultToolkit().getSystemEventQueue();
-                        secondaryLoop = eventQueue.createSecondaryLoop(cond, modalFilter, 5000);
+                        secondaryLoop = eventQueue.createSecondaryLoop(cond, modalFilter, 0);
                         if (!secondaryLoop.enter()) {
                             secondaryLoop = null;
                         }
diff -r f6fc8cb4cef7 -r ecf7952e13ef jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java	Tue Sep 28 00:20:15 2010 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XBaseWindow.java	Tue Sep 28 11:43:45 2010 -0700
@@ -705,12 +705,8 @@
             throw new IllegalStateException("Attempt to resize uncreated window");
         }
         insLog.fine("Setting bounds on " + this + " to (" + x + ", " + y + "), " + width + "x" + height);
-        if (width <= 0) {
-            width = 1;
-        }
-        if (height <= 0) {
-            height = 1;
-        }
+        width = Math.max(MIN_SIZE, width);
+        height = Math.max(MIN_SIZE, height);
         XToolkit.awtLock();
         try {
              XlibWrapper.XMoveResizeWindow(XToolkit.getDisplay(), getWindow(), x,y,width,height);
diff -r f6fc8cb4cef7 -r ecf7952e13ef jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java	Tue Sep 28 00:20:15 2010 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11/XDecoratedPeer.java	Tue Sep 28 11:43:45 2010 -0700
@@ -763,12 +763,8 @@
     }
 
     private void checkShellRectSize(Rectangle shellRect) {
-        if (shellRect.width < 0) {
-            shellRect.width = 1;
-        }
-        if (shellRect.height < 0) {
-            shellRect.height = 1;
-        }
+        shellRect.width = Math.max(MIN_SIZE, shellRect.width);
+        shellRect.height = Math.max(MIN_SIZE, shellRect.height);
     }
 
     private void checkShellRectPos(Rectangle shellRect) {