src/share/classes/sun/awt/DebugSettings.java

*** 100,127 ****
          instance = new DebugSettings();
          instance.loadNativeSettings();
      }
  
      private DebugSettings() {
!         new java.security.PrivilegedAction() {
!             public Object run() {
                  loadProperties();
                  return null;
              }
!         }.run();
      }
  
      /*
       * Load debug properties from file, then override
       * with any command line specified properties
       */
      private synchronized void loadProperties() {
          // setup initial properties
          java.security.AccessController.doPrivileged(
!             new java.security.PrivilegedAction()
!         {
!             public Object run() {
                  loadDefaultProperties();
                  loadFileProperties();
                  loadSystemProperties();
                  return null;
              }
--- 100,127 ----
          instance = new DebugSettings();
          instance.loadNativeSettings();
      }
  
      private DebugSettings() {
!         java.security.AccessController.doPrivileged(
!             new java.security.PrivilegedAction<Void>() {
!                 public Void run() {
                      loadProperties();
                      return null;
                  }
!             });
      }
  
      /*
       * Load debug properties from file, then override
       * with any command line specified properties
       */
      private synchronized void loadProperties() {
          // setup initial properties
          java.security.AccessController.doPrivileged(
!             new java.security.PrivilegedAction<Void>() {
!                 public Void run() {
                      loadDefaultProperties();
                      loadFileProperties();
                      loadSystemProperties();
                      return null;
                  }
*** 132,147 ****
              log.fine("DebugSettings:\n{0}" + this);
          }
      }
  
      public String toString() {
-         Enumeration enum_ = props.propertyNames();
          ByteArrayOutputStream bout = new ByteArrayOutputStream();
          PrintStream pout = new PrintStream(bout);
! 
!         while (enum_.hasMoreElements()) {
!             String key = (String)enum_.nextElement();
              String value = props.getProperty(key, "");
              pout.println(key + " = " + value);
          }
          return new String(bout.toByteArray());
      }
--- 132,144 ----
              log.fine("DebugSettings:\n{0}" + this);
          }
      }
  
      public String toString() {
          ByteArrayOutputStream bout = new ByteArrayOutputStream();
          PrintStream pout = new PrintStream(bout);
!         for (String key : props.stringPropertyNames()) {
              String value = props.getProperty(key, "");
              pout.println(key + " = " + value);
          }
          return new String(bout.toByteArray());
      }
*** 196,208 ****
       * overriding default or file properties
       */
      private void loadSystemProperties() {
          // override file properties with system properties
          Properties sysProps = System.getProperties();
!         Enumeration enum_ = sysProps.propertyNames();
!         while ( enum_.hasMoreElements() ) {
!             String key = (String)enum_.nextElement();
              String value = sysProps.getProperty(key,"");
              // copy any "awtdebug" properties over
              if ( key.startsWith(PREFIX) ) {
                  props.setProperty(key, value);
              }
--- 193,203 ----
       * overriding default or file properties
       */
      private void loadSystemProperties() {
          // override file properties with system properties
          Properties sysProps = System.getProperties();
!         for (String key : sysProps.stringPropertyNames()) {
              String value = sysProps.getProperty(key,"");
              // copy any "awtdebug" properties over
              if ( key.startsWith(PREFIX) ) {
                  props.setProperty(key, value);
              }
*** 242,262 ****
          String  value = props.getProperty(actualKeyName, defval);
          //println(actualKeyName+"="+value);
          return value;
      }
  
!     public synchronized Enumeration getPropertyNames() {
!         Vector          propNames = new Vector();
!         Enumeration     enum_ = props.propertyNames();
! 
          // remove global prefix from property names
!         while ( enum_.hasMoreElements() ) {
!             String propName = (String)enum_.nextElement();
              propName = propName.substring(PREFIX.length()+1);
!             propNames.addElement(propName);
          }
!         return propNames.elements();
      }
  
      private void println(Object object) {
          if (log.isLoggable(PlatformLogger.FINER)) {
              log.finer(object.toString());
--- 237,254 ----
          String  value = props.getProperty(actualKeyName, defval);
          //println(actualKeyName+"="+value);
          return value;
      }
  
!     private synchronized List<String> getPropertyNames() {
!         List<String> propNames = new LinkedList<>();
          // remove global prefix from property names
!         for (String propName : props.stringPropertyNames()) {
              propName = propName.substring(PREFIX.length()+1);
!             propNames.add(propName);
          }
!         return propNames;
      }
  
      private void println(Object object) {
          if (log.isLoggable(PlatformLogger.FINER)) {
              log.finer(object.toString());
*** 277,306 ****
          setCTracingOn(ctracingOn);
  
          //
          // Filter out file/line ctrace properties from debug settings
          //
!         Vector                traces = new Vector();
!         Enumeration         enum_ = getPropertyNames();
  
!         while ( enum_.hasMoreElements() ) {
!             String key = (String)enum_.nextElement();
!             if ( key.startsWith(PROP_CTRACE) && key.length() > PROP_CTRACE_LEN ) {
!                 traces.addElement(key);
              }
          }
  
          // sort traces list so file-level traces will be before line-level ones
          Collections.sort(traces);
  
          //
          // Setup the trace points
          //
!         Enumeration        enumTraces = traces.elements();
! 
!         while ( enumTraces.hasMoreElements() ) {
!             String        key = (String)enumTraces.nextElement();
              String         trace = key.substring(PROP_CTRACE_LEN+1);
              String        filespec;
              String        linespec;
              int                delim= trace.indexOf('@');
              boolean        enabled;
--- 269,293 ----
          setCTracingOn(ctracingOn);
  
          //
          // Filter out file/line ctrace properties from debug settings
          //
!         List<String> traces = new LinkedList<>();
  
!         for (String key : getPropertyNames()) {
!             if (key.startsWith(PROP_CTRACE) && key.length() > PROP_CTRACE_LEN) {
!                 traces.add(key);
              }
          }
  
          // sort traces list so file-level traces will be before line-level ones
          Collections.sort(traces);
  
          //
          // Setup the trace points
          //
!         for (String key : traces) {
              String        trace = key.substring(PROP_CTRACE_LEN+1);
              String        filespec;
              String        linespec;
              int           delim= trace.indexOf('@');
              boolean       enabled;