From nobody Tue May 31 00:44:27 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C33591B49052; Tue, 31 May 2022 00:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LBtp3576bz3Ffl; Tue, 31 May 2022 00:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653957867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8kYRjRuoXeygoop5+CgbfDAc5g5/qILy3BEc1+LwL00=; b=a0F8enYrz/H0p1bAoAbfHSR2tXFwJaImJ51fswYovNvil23O4g0HdvivGx7otClcbWy+Ac yfG3nigkebVJ2BYh8uO4rAkqZXUMh+xtmd1p1LkpXHvX1VUtQSsBUy0tzuboT8hqzq0daQ +tu0vJVdgcSyYA69IPuE/x1Sr4ar1F44JjGDnTYGnrFDigJXyB3El4+MFbVmULihgRM9vv 4yBFXxFukVKUsNJfnPOz6U0RI1oG+HJJIpeyQrfxhr29n7c/xMxGRLSYTJYzL4sf9CZUyH JBNoZN7CegjEXY1Icupc+0d2qwEVBaBQzwFJ7LY/KJorhq03iUE1hf8H8mKK+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9046021B85; Tue, 31 May 2022 00:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24V0iReu087759; Tue, 31 May 2022 00:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24V0iRYS087758; Tue, 31 May 2022 00:44:27 GMT (envelope-from git) Date: Tue, 31 May 2022 00:44:27 GMT Message-Id: <202205310044.24V0iRYS087758@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 0de164bdb551 - main - java/openjdk17: Fix an NPE when using a multi-screen X11 setup List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0de164bdb551505ac86059866d855a8035de983f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653957867; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8kYRjRuoXeygoop5+CgbfDAc5g5/qILy3BEc1+LwL00=; b=vT2TLWBccA9euK4T9PnVlH1rV/118v7nasldrtm1SZB3o/tQeCRyda0DGH/f3G/1RyujGO TYrUpD+KLczFdvjw4zw9nGdN+/GEVQ6yW8WeAgb7dwunKisC7OlXZAF7pkeWD2ZGot7P7Z lb89LbAaCTt98OcCJTXEZcT7fqmiuO40iyJ0SLDnHTHkaQskfc/TxLvhof1OXE8CEMBY/h yq+WqvrEujZLHFl/FjwvkQIoc3os3b+W639vg1oAjLfzXrvgfF1JjIvosfSqFelX/K7rhO VpZ5NjxB3pv1FM6gyNQ/tjAd6E3RjDLQaBP3t9rnF1daN4Q8Jqm9J6WZcg8GVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653957867; a=rsa-sha256; cv=none; b=qN5w7VSEIFMCOuXSvwsq+AwkZ3lSwhxOBNIXMZpcpj+rBXnOQCMEm+IV+178O4Wx4iUW2G d/DCUPnBpSqSdhdwBfOZtS6yjluvl1SNG6voQjnHjUaxHg5IwQ7BQUYJ8RxnL5FpTyiLBN OQTXgLq5bYF3Fkv0A1zHYsUCwy5GsZ7m+2LXf4whGpkfYkWcJSWe0bO/XOY72z4hC142Hs /bcmz9wKFFI9nLAD1fF1TZ3inJaZhlW8K053qe+pj3diAl+AHYhmruI59ocTK4OujUw1J2 E/XL5+UvwU9IG7nHPjTvc4l3tFZdYo5L0OFU4Q6M0cOoSUwnlS9Tvo5t2hyoDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=0de164bdb551505ac86059866d855a8035de983f commit 0de164bdb551505ac86059866d855a8035de983f Author: Sean Farley AuthorDate: 2022-05-31 00:37:59 +0000 Commit: Greg Lewis CommitDate: 2022-05-31 00:42:52 +0000 java/openjdk17: Fix an NPE when using a multi-screen X11 setup PR: 264356 Reported by: scf@ --- ...a.desktop_unix_classes_sun_awt_X11GraphicsEnvironment.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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) :