diff options
| author | Artem Bochkarev <artem.bochkarev@jetbrains.com> | 2020-02-03 12:05:00 +0300 |
|---|---|---|
| committer | Artem Bochkarev <artem.bochkarev@jetbrains.com> | 2020-02-03 12:05:00 +0300 |
| commit | 31b590c16c8437c57ce67f14919bc2aa29530624 (patch) | |
| tree | 18ec57a999c1a1d7a80593918f94a15a4efdda90 /src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java | |
| parent | 78bdb2e198a488d7e117793db64d81e7c28e8886 (diff) | |
| download | JetBrainsRuntime-31b590c16c8437c57ce67f14919bc2aa29530624.tar.gz | |
JBR-2111: enable X11_DISABLE_OVERRIDE_FLAG by defaultjb11_0_6-b708
Diffstat (limited to 'src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java')
| -rw-r--r-- | src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java b/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java index 25489365bb9..6573679cea6 100644 --- a/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java +++ b/src/java.desktop/unix/classes/sun/awt/X11/XWindowPeer.java @@ -54,7 +54,7 @@ import sun.awt.X11GraphicsEnvironment; import sun.java2d.pipe.Region; import sun.util.logging.PlatformLogger; -import sun.security.action.GetBooleanAction; +import sun.security.action.GetPropertyAction; class XWindowPeer extends XPanelPeer implements WindowPeer, DisplayChangedListener { @@ -66,11 +66,13 @@ class XWindowPeer extends XPanelPeer implements WindowPeer, private static final PlatformLogger iconLog = PlatformLogger.getLogger("sun.awt.X11.icon.XWindowPeer"); // workaround for JBR-1680 (see https://youtrack.jetbrains.com/issue/JBR-1680#focus=streamItem-27-3821223.0-0) - private static final boolean X11_DISABLE_OVERRIDE_FLAG = AccessController.doPrivileged( - new GetBooleanAction("x11.disable.override.flag")); - private static final boolean X11_DISABLE_OVERRIDE_XWINDOWPEER = AccessController.doPrivileged( - new GetBooleanAction("x11.disable.override.xwindowpeer")); - + // + // enable X11_DISABLE_OVERRIDE_FLAG by default (users haven't found side-effects), see + // https://youtrack.jetbrains.com/issue/JBR-1680#focus=streamItem-27-3924178.0-0 + private static final boolean X11_DISABLE_OVERRIDE_FLAG = + GetPropertyAction.privilegedGetProperty("x11.disable.override.flag", "true").equalsIgnoreCase("true"); + private static final boolean X11_DISABLE_OVERRIDE_XWINDOWPEER = + GetPropertyAction.privilegedGetProperty("x11.disable.override.xwindowpeer", "false").equalsIgnoreCase("true"); // should be synchronized on awtLock private static Set<XWindowPeer> windows = new HashSet<XWindowPeer>(); |