jdk/src/share/classes/java/util/logging/Logging.java

rev 5709 : 6664509: Add logging context
6664528: Find log level matching its name or value given at construction time
Reviewed-by: alanb, ahgross, jgish, hawtin

*** 32,50 ****
  /**
   * Logging is the implementation class of LoggingMXBean.
   *
   * The <tt>LoggingMXBean</tt> interface provides a standard
   * method for management access to the individual
!  * java.util.Logger objects available at runtime.
   *
   * @author Ron Mann
   * @author Mandy Chung
   * @since 1.5
   *
   * @see javax.management
!  * @see java.util.Logger
!  * @see java.util.LogManager
   */
  class Logging implements LoggingMXBean {
  
      private static LogManager logManager = LogManager.getLogManager();
  
--- 32,50 ----
  /**
   * Logging is the implementation class of LoggingMXBean.
   *
   * The <tt>LoggingMXBean</tt> interface provides a standard
   * method for management access to the individual
!  * {@code Logger} objects available at runtime.
   *
   * @author Ron Mann
   * @author Mandy Chung
   * @since 1.5
   *
   * @see javax.management
!  * @see Logger
!  * @see LogManager
   */
  class Logging implements LoggingMXBean {
  
      private static LogManager logManager = LogManager.getLogManager();
  
*** 73,102 ****
  
          Level level = l.getLevel();
          if (level == null) {
              return EMPTY_STRING;
          } else {
!             return level.getName();
          }
      }
  
      public void setLoggerLevel(String loggerName, String levelName) {
          if (loggerName == null) {
              throw new NullPointerException("loggerName is null");
          }
  
          Logger logger = logManager.getLogger(loggerName);
- 
          if (logger == null) {
              throw new IllegalArgumentException("Logger " + loggerName +
                  "does not exist");
          }
  
          Level level = null;
          if (levelName != null) {
              // parse will throw IAE if logLevel is invalid
!             level = Level.parse(levelName);
          }
  
          logger.setLevel(level);
      }
  
--- 73,104 ----
  
          Level level = l.getLevel();
          if (level == null) {
              return EMPTY_STRING;
          } else {
!             return level.getLevelName();
          }
      }
  
      public void setLoggerLevel(String loggerName, String levelName) {
          if (loggerName == null) {
              throw new NullPointerException("loggerName is null");
          }
  
          Logger logger = logManager.getLogger(loggerName);
          if (logger == null) {
              throw new IllegalArgumentException("Logger " + loggerName +
                  "does not exist");
          }
  
          Level level = null;
          if (levelName != null) {
              // parse will throw IAE if logLevel is invalid
!             level = Level.findLevel(levelName);
!             if (level == null) {
!                 throw new IllegalArgumentException("Unknown level \"" + levelName + "\"");
!             }
          }
  
          logger.setLevel(level);
      }