src/share/classes/java/util/logging/LogManager.java

rev 7022 : 8013380: Removal of stack walk to find resource bundle breaks Glassfish startup
Summary: Use caller's classloader to load resource as an alternative to thread context classloader and system classloader
Reviewed-by: duke

*** 431,445 ****
      //
      // This method must delegate to the LogManager implementation to
      // add a new Logger or return the one that has been added previously
      // as a LogManager subclass may override the addLogger, getLogger,
      // readConfiguration, and other methods.
!     Logger demandLogger(String name, String resourceBundleName) {
          Logger result = getLogger(name);
          if (result == null) {
              // only allocate the new logger once
!             Logger newLogger = new Logger(name, resourceBundleName);
              do {
                  if (addLogger(newLogger)) {
                      // We successfully added the new Logger that we
                      // created above so return it without refetching.
                      return newLogger;
--- 431,447 ----
      //
      // This method must delegate to the LogManager implementation to
      // add a new Logger or return the one that has been added previously
      // as a LogManager subclass may override the addLogger, getLogger,
      // readConfiguration, and other methods.
!     Logger demandLogger(String name, String resourceBundleName,
!             ClassLoader callersClassLoader) {
          Logger result = getLogger(name);
          if (result == null) {
              // only allocate the new logger once
!             Logger newLogger = new Logger(name, resourceBundleName,
!                                           callersClassLoader);
              do {
                  if (addLogger(newLogger)) {
                      // We successfully added the new Logger that we
                      // created above so return it without refetching.
                      return newLogger;
*** 517,527 ****
          }
  
          Logger demandLogger(String name, String resourceBundleName) {
              // a LogManager subclass may have its own implementation to add and
              // get a Logger.  So delegate to the LogManager to do the work.
!             return manager.demandLogger(name, resourceBundleName);
          }
  
          synchronized Logger findLogger(String name) {
              LoggerWeakRef ref = namedLoggers.get(name);
              if (ref == null) {
--- 519,529 ----
          }
  
          Logger demandLogger(String name, String resourceBundleName) {
              // a LogManager subclass may have its own implementation to add and
              // get a Logger.  So delegate to the LogManager to do the work.
!             return manager.demandLogger(name, resourceBundleName, null);
          }
  
          synchronized Logger findLogger(String name) {
              LoggerWeakRef ref = namedLoggers.get(name);
              if (ref == null) {