equal
deleted
inserted
replaced
1346 if (adata->awt_cmap == (Colormap) NULL) { |
1346 if (adata->awt_cmap == (Colormap) NULL) { |
1347 awtJNI_CreateColorData (env, adata, 1); |
1347 awtJNI_CreateColorData (env, adata, 1); |
1348 } |
1348 } |
1349 |
1349 |
1350 /* Make Color Model object for this GraphicsConfiguration */ |
1350 /* Make Color Model object for this GraphicsConfiguration */ |
1351 colorModel = awtJNI_GetColorModel (env, adata); |
1351 colorModel = (*env)->ExceptionCheck(env) |
|
1352 ? NULL : awtJNI_GetColorModel (env, adata); |
|
1353 |
1352 AWT_UNLOCK (); |
1354 AWT_UNLOCK (); |
1353 |
1355 |
1354 return colorModel; |
1356 return colorModel; |
1355 #endif /* !HEADLESS */ |
1357 #endif /* !HEADLESS */ |
1356 } |
1358 } |
2050 awt_XRRFreeScreenConfigInfo(config); |
2052 awt_XRRFreeScreenConfigInfo(config); |
2051 } |
2053 } |
2052 |
2054 |
2053 AWT_FLUSH_UNLOCK(); |
2055 AWT_FLUSH_UNLOCK(); |
2054 |
2056 |
2055 if (!success) { |
2057 if (!success && !(*env)->ExceptionCheck(env)) { |
2056 JNU_ThrowInternalError(env, "Could not set display mode"); |
2058 JNU_ThrowInternalError(env, "Could not set display mode"); |
2057 } |
2059 } |
2058 #endif /* !HEADLESS */ |
2060 #endif /* !HEADLESS */ |
2059 } |
2061 } |
2060 |
2062 |