diff options
| author | lana <none@none> | 2013-10-08 14:53:14 -0700 |
|---|---|---|
| committer | lana <none@none> | 2013-10-08 14:53:14 -0700 |
| commit | 80c71338a257b2e863e32c8026d476a35a21e5e4 (patch) | |
| tree | a8f376ba74517373aaadce964b1daa574700b85d /src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | |
| parent | 08788f5175d21d9b936d5e6fabb606dfd73e0228 (diff) | |
| parent | 182c28b23f21a94de48410979716829f118db30b (diff) | |
| download | jdk8u_jdk-80c71338a257b2e863e32c8026d476a35a21e5e4.tar.gz | |
Merge
Diffstat (limited to 'src/solaris/classes/sun/awt/X11GraphicsEnvironment.java')
| -rw-r--r-- | src/solaris/classes/sun/awt/X11GraphicsEnvironment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java b/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java index 47449f25c9..60846b69c1 100644 --- a/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java +++ b/src/solaris/classes/sun/awt/X11GraphicsEnvironment.java @@ -25,8 +25,8 @@ package sun.awt; +import java.awt.AWTError; import java.awt.GraphicsDevice; - import java.awt.Point; import java.awt.Rectangle; import java.io.BufferedReader; @@ -205,7 +205,12 @@ public class X11GraphicsEnvironment * Returns the default screen graphics device. */ public GraphicsDevice getDefaultScreenDevice() { - return getScreenDevices()[getDefaultScreenNum()]; + GraphicsDevice[] screens = getScreenDevices(); + if (screens.length == 0) { + throw new AWTError("no screen devices"); + } + int index = getDefaultScreenNum(); + return screens[0 < index && index < screens.length ? index : 0]; } public boolean isDisplayLocal() { |