From 85e10718ce8960f347340a549bdfce17151797cb Mon Sep 17 00:00:00 2001
From: Anthony Petrov <anthony@openjdk.org>
Date: Fri, 23 Oct 2009 14:52:55 +0400
Subject: [PATCH] 6887249: Get rid of double-check for isValid() idiom in
 validate() methods

Reviewed-by: art, dcherepanov
---
 jdk/src/share/classes/java/awt/Container.java | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/jdk/src/share/classes/java/awt/Container.java b/jdk/src/share/classes/java/awt/Container.java
index 84334c9973e..94273ade4cb 100644
--- a/jdk/src/share/classes/java/awt/Container.java
+++ b/jdk/src/share/classes/java/awt/Container.java
@@ -1583,34 +1583,31 @@ public class Container extends Component {
      * @see #validateTree
      */
     public void validate() {
-        /* Avoid grabbing lock unless really necessary. */
-        if (!isValid() || descendUnconditionallyWhenValidating) {
-            boolean updateCur = false;
-            synchronized (getTreeLock()) {
-                if ((!isValid() || descendUnconditionallyWhenValidating)
-                        && peer != null)
-                {
-                    ContainerPeer p = null;
-                    if (peer instanceof ContainerPeer) {
-                        p = (ContainerPeer) peer;
-                    }
-                    if (p != null) {
-                        p.beginValidate();
-                    }
-                    validateTree();
-                    if (p != null) {
-                        p.endValidate();
-                        // Avoid updating cursor if this is an internal call.
-                        // See validateUnconditionally() for details.
-                        if (!descendUnconditionallyWhenValidating) {
-                            updateCur = isVisible();
-                        }
+        boolean updateCur = false;
+        synchronized (getTreeLock()) {
+            if ((!isValid() || descendUnconditionallyWhenValidating)
+                    && peer != null)
+            {
+                ContainerPeer p = null;
+                if (peer instanceof ContainerPeer) {
+                    p = (ContainerPeer) peer;
+                }
+                if (p != null) {
+                    p.beginValidate();
+                }
+                validateTree();
+                if (p != null) {
+                    p.endValidate();
+                    // Avoid updating cursor if this is an internal call.
+                    // See validateUnconditionally() for details.
+                    if (!descendUnconditionallyWhenValidating) {
+                        updateCur = isVisible();
                     }
                 }
             }
-            if (updateCur) {
-                updateCursorImmediately();
-            }
+        }
+        if (updateCur) {
+            updateCursorImmediately();
         }
     }