diff options
Diffstat (limited to 'java/awt/Toolkit.java')
| -rw-r--r-- | java/awt/Toolkit.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/java/awt/Toolkit.java b/java/awt/Toolkit.java index 5ac9e2766..69040722e 100644 --- a/java/awt/Toolkit.java +++ b/java/awt/Toolkit.java @@ -556,13 +556,6 @@ public abstract class Toolkit if (toolkit != null) return toolkit; - // Check for the headless property. - if (GraphicsEnvironment.isHeadless()) - { - toolkit = new HeadlessToolkit(); - return toolkit; - } - String toolkit_name = SystemProperties.getProperty("awt.toolkit", default_toolkit_name); try @@ -592,8 +585,18 @@ public abstract class Toolkit } catch (Throwable t) { - AWTError e = new AWTError("Cannot load AWT toolkit: " + toolkit_name); - throw (AWTError) e.initCause(t); + // Check for the headless property. + if (GraphicsEnvironment.isHeadless()) + { + toolkit = new HeadlessToolkit(); + return toolkit; + } + else + { + AWTError e = new AWTError("Cannot load AWT toolkit: " + + toolkit_name); + throw (AWTError) e.initCause(t); + } } } |