src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -1875,10 +1875,12 @@
     XRRScreenConfiguration *config;
     jobject displayMode = NULL;
 
     AWT_LOCK();
 
+    if (screen < ScreenCount(awt_display)) {
+
     config = awt_XRRGetScreenInfo(awt_display,
                                   RootWindow(awt_display, screen));
     if (config != NULL) {
         Rotation rotation;
         short curRate;

@@ -1901,10 +1903,11 @@
                                                   curRate);
         }
 
         awt_XRRFreeScreenConfigInfo(config);
     }
+    }
 
     AWT_FLUSH_UNLOCK();
 
     return displayMode;
 #endif /* HEADLESS */