diff options
| -rw-r--r-- | src/javax/media/j3d/MasterControl.java | 5 | ||||
| -rw-r--r-- | src/javax/media/j3d/VirtualUniverse.java | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/javax/media/j3d/MasterControl.java b/src/javax/media/j3d/MasterControl.java index 0d7af66..c63dfd9 100644 --- a/src/javax/media/j3d/MasterControl.java +++ b/src/javax/media/j3d/MasterControl.java @@ -833,6 +833,11 @@ private static String getProperty(final String prop) { // Use default pipeline } + // Java 3D cannot run in headless mode unless using the noop renderer + if (java.awt.GraphicsEnvironment.isHeadless() && pipelineType != Pipeline.Type.NOOP) { + throw new java.awt.HeadlessException(); + } + // Construct the singleton Pipeline instance Pipeline.createPipeline(pipelineType); diff --git a/src/javax/media/j3d/VirtualUniverse.java b/src/javax/media/j3d/VirtualUniverse.java index 624bccb..42e3725 100644 --- a/src/javax/media/j3d/VirtualUniverse.java +++ b/src/javax/media/j3d/VirtualUniverse.java @@ -262,13 +262,6 @@ ArrayList<Integer> viewIdFreeList = new ArrayList<Integer>(); } } - // Java 3D cannot run in headless mode, so we will throw a - // HeadlessException if isHeadless() is true. This avoids a - // cryptic error message from MasterControl.loadLibraries(). - if (java.awt.GraphicsEnvironment.isHeadless()) { - throw new java.awt.HeadlessException(); - } - // Load the native libraries and create the static // MasterControl object MasterControl.loadLibraries(); |