test/java/lang/System/LoggerFinder/jdk/DefaultLoggerBridgeTest/DefaultLoggerBridgeTest.java

*** 46,55 ****
--- 46,56 ----
  import java.util.logging.LogRecord;
  import java.lang.System.LoggerFinder;
  import java.lang.System.Logger;
  import java.util.stream.Stream;
  import sun.util.logging.internal.LoggingProviderImpl;
+ import java.lang.reflect.Module;
  
  /**
   * @test
   * @bug     8140364
   * @summary JDK implementation specific unit test for JDK internal artifacts.
*** 244,254 ****
          } finally {
              allowAccess.get().set(old);
          }
      }
  
!     static Logger getLogger(String name, Class<?> caller) {
          boolean old = allowAccess.get().get();
          allowAccess.get().set(true);
          try {
              return jdk.internal.logger.LazyLoggers.getLogger(name, caller);
          } finally {
--- 245,255 ----
          } finally {
              allowAccess.get().set(old);
          }
      }
  
!     static Logger getLogger(String name, Module caller) {
          boolean old = allowAccess.get().get();
          allowAccess.get().set(true);
          try {
              return jdk.internal.logger.LazyLoggers.getLogger(name, caller);
          } finally {
*** 309,320 ****
  
          ResourceBundle loggerBundle =
                  ResourceBundle.getBundle(MyLoggerBundle.class.getName());
          final Map<Object, String> loggerDescMap = new HashMap<>();
  
!         Logger sysLogger1a = getLogger("foo", Thread.class);
!         loggerDescMap.put(sysLogger1a, "jdk.internal.logger.LazyLoggers.getLogger(\"foo\", Thread.class)");
  
          Logger appLogger1 = System.getLogger("foo");
          loggerDescMap.put(appLogger1, "System.getLogger(\"foo\")");
  
          LoggerFinder provider;
--- 310,321 ----
  
          ResourceBundle loggerBundle =
                  ResourceBundle.getBundle(MyLoggerBundle.class.getName());
          final Map<Object, String> loggerDescMap = new HashMap<>();
  
!         Logger sysLogger1a = getLogger("foo", Thread.class.getModule());
!         loggerDescMap.put(sysLogger1a, "jdk.internal.logger.LazyLoggers.getLogger(\"foo\", Thread.class.getModule())");
  
          Logger appLogger1 = System.getLogger("foo");
          loggerDescMap.put(appLogger1, "System.getLogger(\"foo\")");
  
          LoggerFinder provider;
*** 339,351 ****
              }
          }
  
          Logger sysLogger1b = null;
          try {
!             sysLogger1b = provider.getLogger("foo", Thread.class);
              if (sysLogger1b != sysLogger1a) {
!                 loggerDescMap.put(sysLogger1b, "provider.getLogger(\"foo\", Thread.class)");
              }
              if (!hasRequiredPermissions) {
                  throw new RuntimeException("Managed to obtain a system logger without permission");
              }
          } catch (AccessControlException acx) {
--- 340,352 ----
              }
          }
  
          Logger sysLogger1b = null;
          try {
!             sysLogger1b = provider.getLogger("foo", Thread.class.getModule());
              if (sysLogger1b != sysLogger1a) {
!                 loggerDescMap.put(sysLogger1b, "provider.getLogger(\"foo\", Thread.class.getModule())");
              }
              if (!hasRequiredPermissions) {
                  throw new RuntimeException("Managed to obtain a system logger without permission");
              }
          } catch (AccessControlException acx) {
*** 365,376 ****
              throw new RuntimeException("identical loggers");
          }
  
          Logger sysLogger2 = null;
          try {
!             sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class);
!             loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class)");
              if (!hasRequiredPermissions) {
                  throw new RuntimeException("Managed to obtain a system logger without permission");
              }
          } catch (AccessControlException acx) {
              if (hasRequiredPermissions) {
--- 366,377 ----
              throw new RuntimeException("identical loggers");
          }
  
          Logger sysLogger2 = null;
          try {
!             sysLogger2 = provider.getLocalizedLogger("foo", loggerBundle, Thread.class.getModule());
!             loggerDescMap.put(sysLogger2, "provider.getLocalizedLogger(\"foo\", loggerBundle, Thread.class.getModule())");
              if (!hasRequiredPermissions) {
                  throw new RuntimeException("Managed to obtain a system logger without permission");
              }
          } catch (AccessControlException acx) {
              if (hasRequiredPermissions) {
*** 394,406 ****
          final MyHandler sysHandler;
          final boolean old = allowAll.get().get();
          allowAll.get().set(true);
          try {
              sysSink = LoggingProviderImpl.getLogManagerAccess().demandLoggerFor(
!                     LogManager.getLogManager(), "foo", Thread.class);
              appSink = LoggingProviderImpl.getLogManagerAccess().demandLoggerFor(
!                     LogManager.getLogManager(), "foo", DefaultLoggerBridgeTest.class);
              if (appSink == sysSink) {
                  throw new RuntimeException("identical backend loggers");
              }
              appSink.addHandler(appHandler = new MyHandler());
              sysSink.addHandler(sysHandler = new MyHandler());
--- 395,407 ----
          final MyHandler sysHandler;
          final boolean old = allowAll.get().get();
          allowAll.get().set(true);
          try {
              sysSink = LoggingProviderImpl.getLogManagerAccess().demandLoggerFor(
!                     LogManager.getLogManager(), "foo", Thread.class.getModule());
              appSink = LoggingProviderImpl.getLogManagerAccess().demandLoggerFor(
!                     LogManager.getLogManager(), "foo", DefaultLoggerBridgeTest.class.getModule());
              if (appSink == sysSink) {
                  throw new RuntimeException("identical backend loggers");
              }
              appSink.addHandler(appHandler = new MyHandler());
              sysSink.addHandler(sysHandler = new MyHandler());