src/share/classes/java/awt/GraphicsEnvironment.java

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2013, 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
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, 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
*** 93,114 ****
      private static GraphicsEnvironment createGE() {
          GraphicsEnvironment ge;
          String nm = AccessController.doPrivileged(new GetPropertyAction("java.awt.graphicsenv", null));
          try {
  //          long t0 = System.currentTimeMillis();
!             Class<GraphicsEnvironment> geCls;
              try {
                  // First we try if the bootclassloader finds the requested
                  // class. This way we can avoid to run in a privileged block.
!                 geCls = (Class<GraphicsEnvironment>)Class.forName(nm);
              } catch (ClassNotFoundException ex) {
                  // If the bootclassloader fails, we try again with the
                  // application classloader.
                  ClassLoader cl = ClassLoader.getSystemClassLoader();
!                 geCls = (Class<GraphicsEnvironment>)Class.forName(nm, true, cl);
              }
!             ge = geCls.newInstance();
  //          long t1 = System.currentTimeMillis();
  //          System.out.println("GE creation took " + (t1-t0)+ "ms.");
              if (isHeadless()) {
                  ge = new HeadlessGraphicsEnvironment(ge);
              }
--- 93,114 ----
      private static GraphicsEnvironment createGE() {
          GraphicsEnvironment ge;
          String nm = AccessController.doPrivileged(new GetPropertyAction("java.awt.graphicsenv", null));
          try {
  //          long t0 = System.currentTimeMillis();
!             Class<?> geCls;
              try {
                  // First we try if the bootclassloader finds the requested
                  // class. This way we can avoid to run in a privileged block.
!                 geCls = Class.forName(nm);
              } catch (ClassNotFoundException ex) {
                  // If the bootclassloader fails, we try again with the
                  // application classloader.
                  ClassLoader cl = ClassLoader.getSystemClassLoader();
!                 geCls = Class.forName(nm, true, cl);
              }
!             ge = GraphicsEnvironment.class.cast(geCls.newInstance());
  //          long t1 = System.currentTimeMillis();
  //          System.out.println("GE creation took " + (t1-t0)+ "ms.");
              if (isHeadless()) {
                  ge = new HeadlessGraphicsEnvironment(ge);
              }