diff options
| author | Sean Farley <scf@FreeBSD.org> | 2022-05-31 00:37:59 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2022-05-31 00:42:52 +0000 |
| commit | 0de164bdb551505ac86059866d855a8035de983f (patch) | |
| tree | aa509a49efa767ee531953ceed5dc66dbb2c8f6a | |
| parent | 98287eee11415c3050f1f56d8347da688926238b (diff) | |
| download | ports-0de164bdb551505ac86059866d855a8035de983f.tar.gz ports-0de164bdb551505ac86059866d855a8035de983f.zip | |
java/openjdk17: Fix an NPE when using a multi-screen X11 setup
PR: 264356
Reported by: scf@
| -rw-r--r-- | java/openjdk17/files/patch-src_java.desktop_unix_classes_sun_awt_X11GraphicsEnvironment.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/java/openjdk17/files/patch-src_java.desktop_unix_classes_sun_awt_X11GraphicsEnvironment.java b/java/openjdk17/files/patch-src_java.desktop_unix_classes_sun_awt_X11GraphicsEnvironment.java new file mode 100644 index 000000000000..7019cf8b290d --- /dev/null +++ b/java/openjdk17/files/patch-src_java.desktop_unix_classes_sun_awt_X11GraphicsEnvironment.java @@ -0,0 +1,11 @@ +--- src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java ++++ src/java.desktop/unix/classes/sun/awt/X11GraphicsEnvironment.java +@@ -232,7 +232,7 @@ public final class X11GraphicsEnvironment extends SunGraphicsEnvironment { + throw new AWTError("no screen devices"); + } + int index = getDefaultScreenNum(); +- mainScreen = 0 < index && index < screens.length ? index : 0; ++ mainScreen = 0 < index && index < numScreens ? index : 0; + + for (int id = 0; id < numScreens; ++id) { + devices.put(id, old.containsKey(id) ? old.remove(id) : |