# HG changeset patch
# User serb
# Date 1310743173 -14400
# Node ID daec42746ec0f4faf8564e966b5cb8e9a123d835
# Parent  f211e6ca5dffdca01ff5ae008c79198ca4c4de95
7043815: AWT-XAWT - AWT-EventQueue-0 deadlock.
Reviewed-by: art, dcherepanov

diff -r f211e6ca5dff -r daec42746ec0 jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java
--- a/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java	Fri Jul 15 19:18:38 2011 +0400
+++ b/jdk/src/solaris/classes/sun/awt/X11/XTextAreaPeer.java	Fri Jul 15 19:19:33 2011 +0400
@@ -185,11 +185,8 @@
      */
     @Override
     public void pSetCursor(Cursor cursor, boolean ignoreSubComponents) {
-        Point onScreen = getLocationOnScreen();
         if (ignoreSubComponents ||
-            javaMouseEventHandler == null ||
-            onScreen == null)
-        {
+            javaMouseEventHandler == null) {
             super.pSetCursor(cursor, true);
             return;
         }
@@ -197,6 +194,7 @@
         Point cursorPos = new Point();
         ((XGlobalCursorManager)XGlobalCursorManager.getCursorManager()).getCursorPos(cursorPos);
 
+        final Point onScreen = getLocationOnScreen();
         Point localPoint = new Point(cursorPos.x - onScreen.x, cursorPos.y - onScreen.y );
 
         javaMouseEventHandler.setPointerToUnderPoint(localPoint);