stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6961754: JCK tests CvsEventTest0001 and CvsEventTest0002 fail under FF 3.5 on OEL 5

Browse Source 
Check the return value of XlibUtil.translateCoordinates() for null

Reviewed-by: art, dcherepanov
This commit is contained in:
Anthony Petrov 2010-06-18 17:13:26 +04:00
parent a0e99eb3e4
commit c49c7ce7e8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/solaris/classes/sun/awt/X11/XEmbeddedFramePeer.java
View File

@ -275,7 +275,7 @@ public class XEmbeddedFramePeer extends XFramePeer {
Point absoluteLoc = XlibUtil.translateCoordinates(getWindow(), Point absoluteLoc = XlibUtil.translateCoordinates(getWindow(),
XToolkit.getDefaultRootWindow(), XToolkit.getDefaultRootWindow(),
new Point(0, 0)); new Point(0, 0));
return absoluteLoc.x; return absoluteLoc != null ? absoluteLoc.x : 0;
} }
public int getAbsoluteY() public int getAbsoluteY()
@ -283,7 +283,7 @@ public class XEmbeddedFramePeer extends XFramePeer {
Point absoluteLoc = XlibUtil.translateCoordinates(getWindow(), Point absoluteLoc = XlibUtil.translateCoordinates(getWindow(),
XToolkit.getDefaultRootWindow(), XToolkit.getDefaultRootWindow(),
new Point(0, 0)); new Point(0, 0));
return absoluteLoc.y; return absoluteLoc != null ? absoluteLoc.y : 0;
} }
public int getWidth() { public int getWidth() {

2
jdk/src/solaris/classes/sun/awt/X11/XToolkit.java
View File

@ -849,7 +849,7 @@ public final class XToolkit extends UNIXToolkit implements Runnable {
// if _NET_WM_STRUT_PARTIAL is present, we should use its values to detect // if _NET_WM_STRUT_PARTIAL is present, we should use its values to detect
// if the struts area intersects with screenBounds, however some window // if the struts area intersects with screenBounds, however some window
// managers don't set this hint correctly, so we just get intersection with windowBounds // managers don't set this hint correctly, so we just get intersection with windowBounds
if (windowBounds.intersects(screenBounds)) if (windowBounds != null && windowBounds.intersects(screenBounds))
{ {
insets.left = Math.max((int)Native.getLong(native_ptr, 0), insets.left); insets.left = Math.max((int)Native.getLong(native_ptr, 0), insets.left);
insets.right = Math.max((int)Native.getLong(native_ptr, 1), insets.right); insets.right = Math.max((int)Native.getLong(native_ptr, 1), insets.right);