7077293: javax/swing/JComponent/4337267/bug4337267.java failed on windows 2003

Reviewed-by: rupashka
Contributed-by: alexandr.scherbatiy@oracle.com

src/share/classes/sun/swing/SwingUtilities2.java

@@ -524,10 +524,21 @@ public class SwingUtilities2 {
         }
 
         // If we get here we're not printing
+        if (g instanceof Graphics2D) {
             AATextInfo info = drawTextAntialiased(c);
-        if (info != null && (g instanceof Graphics2D)) {
             Graphics2D g2 = (Graphics2D)g;
 
+            boolean needsTextLayout = ((c != null) &&
+                (c.getClientProperty(TextAttribute.NUMERIC_SHAPING) != null));
+
+            if (needsTextLayout) {
+                synchronized(charsBufferLock) {
+                    int length = syncCharsBuffer(text);
+                    needsTextLayout = isComplexLayout(charsBuffer, 0, length);
+                }
+            }
+
+            if (info != null) {
                 Object oldContrast = null;
                 Object oldAAValue = g2.getRenderingHint(KEY_TEXT_ANTIALIASING);
                 if (info.aaHint != oldAAValue) {
@@ -545,14 +556,6 @@ public class SwingUtilities2 {
                     }
                 }
 
-            boolean needsTextLayout = ((c != null) &&
-                (c.getClientProperty(TextAttribute.NUMERIC_SHAPING) != null));
-            if (needsTextLayout) {
-                synchronized(charsBufferLock) {
-                    int length = syncCharsBuffer(text);
-                    needsTextLayout = isComplexLayout(charsBuffer, 0, length);
-                }
-            }
                 if (needsTextLayout) {
                     TextLayout layout = createTextLayout(c, text, g2.getFont(),
                                                     g2.getFontRenderContext());
@@ -567,12 +570,20 @@ public class SwingUtilities2 {
                 if (oldContrast != null) {
                     g2.setRenderingHint(KEY_TEXT_LCD_CONTRAST, oldContrast);
                 }
+
+                return;
             }
-        else {
-            g.drawString(text, x, y);
+
+            if (needsTextLayout){
+                TextLayout layout = createTextLayout(c, text, g2.getFont(),
+                                                    g2.getFontRenderContext());
+                layout.draw(g2, x, y);
+                return;
             }
         }
 
+        g.drawString(text, x, y);
+    }
 
     /**
      * Draws the string at the specified location underlining the specified