# HG changeset patch
# User lana
# Date 1314653171 25200
# Node ID 9a5858f8a52f7e1cd2c02cc410191c14e4a4139c
# Parent  cf1fcdf438a0d079397d6648366d729932e3fe72# Parent  0def93fb66ba9aaabf4b0f8afe2a676af13af5a6
Merge

diff -r cf1fcdf438a0 -r 9a5858f8a52f jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java
--- a/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	Thu Aug 25 17:18:12 2011 -0700
+++ b/jdk/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java	Mon Aug 29 14:26:11 2011 -0700
@@ -95,11 +95,11 @@
                     }
 
                     // Now check for XRender system property
-                    boolean xRenderRequested = false;
+                    boolean xRenderRequested = true;
                     String xProp = System.getProperty("sun.java2d.xrender");
                         if (xProp != null) {
-                        if (xProp.equals("true") || xProp.equals("t")) {
-                            xRenderRequested = true;
+                        if (xProp.equals("false") || xProp.equals("f")) {
+                            xRenderRequested = false;
                         } else if (xProp.equals("True") || xProp.equals("T")) {
                             xRenderRequested = true;
                             xRenderVerbose = true;