mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-22 01:09:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-4731 SIGILL caused by NPE Cannot invoke "java.awt.GraphicsConfiguration.getDevice()" because "config" is null

Browse Source 
Handled null device in platform window

(cherry picked from commit 9e52c15ec7)
This commit is contained in:
Alexey Ushakov
2022-10-19 19:04:20 +02:00
committed by jbrbot
parent 699ca6bd64
commit 78cb868777
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/java.desktop/macosx/classes/sun/lwawt/LWWindowPeer.java
View File

@@ -96,6 +96,7 @@ public class LWWindowPeer
}
private static final PlatformLogger focusLog = PlatformLogger.getLogger("sun.lwawt.focus.LWWindowPeer");
private static final PlatformLogger logger = PlatformLogger.getLogger("sun.lwawt.LWWindowPeer");
private final PlatformWindow platformWindow;
@@ -685,7 +686,16 @@ public class LWWindowPeer
setBounds(x, y, w, h, SET_BOUNDS, false, false);
// Second, update the graphics config and surface data
final boolean isNewDevice = updateGraphicsDevice();
GraphicsDevice newGraphicsDevice = platformWindow.getGraphicsDevice();
if (newGraphicsDevice == null) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("Unable to update graphics device: " +
"platform window graphics device is null");
}
return;
}
boolean isNewDevice = updateGraphicsDevice(newGraphicsDevice);
if (isNewDevice && !isMaximizedBoundsSet()) {
setPlatformMaximizedBounds(getDefaultMaximizedBounds());
}
@@ -1078,8 +1088,7 @@ public class LWWindowPeer
/**
* Returns true if the GraphicsDevice has been changed, false otherwise.
*/
public boolean updateGraphicsDevice() {
GraphicsDevice newGraphicsDevice = platformWindow.getGraphicsDevice();
public boolean updateGraphicsDevice(GraphicsDevice newGraphicsDevice) {
synchronized (getStateLock()) {
if (graphicsDevice == newGraphicsDevice) {
return false;
@@ -1101,7 +1110,17 @@ public class LWWindowPeer
@Override
public final void displayChanged() {
if (updateGraphicsDevice()) {
GraphicsDevice newGraphicsDevice = platformWindow.getGraphicsDevice();
if (newGraphicsDevice == null) {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("Unable to update graphics device: " +
"platform window graphics device is null");
}
return;
}
boolean isNewDevice = updateGraphicsDevice(newGraphicsDevice);
if (isNewDevice) {
updateMinimumSize();
if (!isMaximizedBoundsSet()) {
setPlatformMaximizedBounds(getDefaultMaximizedBounds());