jdk-sandbox: comparison jdk/src/java.management/share/classes/javax/management/monitor/Monitor.java

equal deleted inserted replaced

-:cb2a6851b837
+:da1786d695b6
 /*
-* Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2017, 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
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
-import java.util.logging.Level;
+import java.lang.System.Logger.Level;
 import javax.management.AttributeNotFoundException;
 import javax.management.InstanceNotFoundException;
 import javax.management.IntrospectionException;
 import javax.management.MBeanAttributeInfo;
 import javax.management.MBeanException;
 } else {
 int maximumPoolSizeTmp = 10;
 try {
 maximumPoolSizeTmp = Integer.parseInt(maximumPoolSizeStr);
 } catch (NumberFormatException e) {
-if (MONITOR_LOGGER.isLoggable(Level.FINER)) {
+if (MONITOR_LOGGER.isLoggable(Level.TRACE)) {
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE,
-"<static initializer>",
 "Wrong value for " + maximumPoolSizeSysProp +
 " system property", e);
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE,
-"<static initializer>",
 maximumPoolSizeSysProp + " defaults to 10");
 }
 maximumPoolSizeTmp = 10;
 }
 if (maximumPoolSizeTmp < 1) {
 * @exception Exception if something goes wrong
 */
 public ObjectName preRegister(MBeanServer server, ObjectName name)
 throws Exception {
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE,
-"preRegister(MBeanServer, ObjectName)",
 "initialize the reference on the MBean server");
 this.server = server;
 return name;
 }
 *
 * @exception Exception if something goes wrong
 */
 public void preDeregister() throws Exception {
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, "stop the monitor");
-"preDeregister()", "stop the monitor");
 // Stop the Monitor.
 //
 stop();
 }
 /**
 * Starts the monitor.
 */
 void doStart() {
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, "start the monitor");
-"doStart()", "start the monitor");
 synchronized (this) {
 if (isActive()) {
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, "the monitor is already active");
-"doStart()", "the monitor is already active");
 return;
 }
 isActive = true;
 /**
 * Stops the monitor.
 */
 void doStop() {
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, "stop the monitor");
-"doStop()", "stop the monitor");
 synchronized (this) {
 if (!isActive()) {
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, "the monitor is not active");
-"doStop()", "the monitor is not active");
 return;
 }
 isActive = false;
 Object derGauge, Object trigger,
 ObjectName object, boolean onError) {
 if (!isActive())
 return;
-if (MONITOR_LOGGER.isLoggable(Level.FINER)) {
+if (MONITOR_LOGGER.isLoggable(Level.TRACE)) {
-MONITOR_LOGGER.logp(Level.FINER, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, "send notification: " +
-"sendNotification", "send notification: " +
 "\n\tNotification observed object = " + object +
 "\n\tNotification observed attribute = " + observedAttribute +
 "\n\tNotification derived gauge = " + derGauge);
 }
 else {
 notifType = OBSERVED_ATTRIBUTE_TYPE_ERROR;
 setAlreadyNotified(
 o, index, OBSERVED_ATTRIBUTE_TYPE_ERROR_NOTIFIED, an);
 msg = "The observed attribute value is null.";
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, msg);
-"monitor", msg);
 }
 } catch (NullPointerException np_ex) {
 if (isAlreadyNotified(o, RUNTIME_ERROR_NOTIFIED))
 return;
 else {
 setAlreadyNotified(o, index, RUNTIME_ERROR_NOTIFIED, an);
 msg =
 "The monitor must be registered in the MBean " +
 "server or an MBeanServerConnection must be " +
 "explicitly supplied.";
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, msg);
-"monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, np_ex::toString);
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
-"monitor", np_ex.toString());
 }
 } catch (InstanceNotFoundException inf_ex) {
 if (isAlreadyNotified(o, OBSERVED_OBJECT_ERROR_NOTIFIED))
 return;
 else {
 setAlreadyNotified(
 o, index, OBSERVED_OBJECT_ERROR_NOTIFIED, an);
 msg =
 "The observed object must be accessible in " +
 "the MBeanServerConnection.";
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, msg);
-"monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, inf_ex::toString);
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
-"monitor", inf_ex.toString());
 }
 } catch (AttributeNotFoundException anf_ex) {
 if (isAlreadyNotified(o, OBSERVED_ATTRIBUTE_ERROR_NOTIFIED))
 return;
 else {
 setAlreadyNotified(
 o, index, OBSERVED_ATTRIBUTE_ERROR_NOTIFIED, an);
 msg =
 "The observed attribute must be accessible in " +
 "the observed object.";
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, msg);
-"monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, anf_ex::toString);
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
-"monitor", anf_ex.toString());
 }
 } catch (MBeanException mb_ex) {
 if (isAlreadyNotified(o, RUNTIME_ERROR_NOTIFIED))
 return;
 else {
 notifType = RUNTIME_ERROR;
 setAlreadyNotified(o, index, RUNTIME_ERROR_NOTIFIED, an);
 msg = mb_ex.getMessage() == null ? "" : mb_ex.getMessage();
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, msg);
-"monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, mb_ex::toString);
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
-"monitor", mb_ex.toString());
 }
 } catch (ReflectionException ref_ex) {
 if (isAlreadyNotified(o, RUNTIME_ERROR_NOTIFIED)) {
 return;
 } else {
 notifType = RUNTIME_ERROR;
 setAlreadyNotified(o, index, RUNTIME_ERROR_NOTIFIED, an);
 msg = ref_ex.getMessage() == null ? "" : ref_ex.getMessage();
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, msg);
-"monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, ref_ex::toString);
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
-"monitor", ref_ex.toString());
 }
 } catch (IOException io_ex) {
 if (isAlreadyNotified(o, RUNTIME_ERROR_NOTIFIED))
 return;
 else {
 notifType = RUNTIME_ERROR;
 setAlreadyNotified(o, index, RUNTIME_ERROR_NOTIFIED, an);
 msg = io_ex.getMessage() == null ? "" : io_ex.getMessage();
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, msg);
-"monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, io_ex::toString);
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
-"monitor", io_ex.toString());
 }
 } catch (RuntimeException rt_ex) {
 if (isAlreadyNotified(o, RUNTIME_ERROR_NOTIFIED))
 return;
 else {
 notifType = RUNTIME_ERROR;
 setAlreadyNotified(o, index, RUNTIME_ERROR_NOTIFIED, an);
 msg = rt_ex.getMessage() == null ? "" : rt_ex.getMessage();
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
+MONITOR_LOGGER.log(Level.TRACE, msg);
-"monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, rt_ex::toString);
-MONITOR_LOGGER.logp(Level.FINEST, Monitor.class.getName(),
-"monitor", rt_ex.toString());
 }
 }
 synchronized (this) {
 setAlreadyNotified(o, index,
 OBSERVED_ATTRIBUTE_TYPE_ERROR_NOTIFIED, an);
 msg =
 "The observed attribute value does not " +
 "implement the Comparable interface.";
-MONITOR_LOGGER.logp(Level.FINEST,
+MONITOR_LOGGER.log(Level.TRACE, msg);
-Monitor.class.getName(), "monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, e::toString);
-MONITOR_LOGGER.logp(Level.FINEST,
-Monitor.class.getName(), "monitor", e.toString());
 }
 } catch (AttributeNotFoundException e) {
 if (isAlreadyNotified(o, OBSERVED_ATTRIBUTE_ERROR_NOTIFIED))
 return;
 else {
 setAlreadyNotified(
 o, index, OBSERVED_ATTRIBUTE_ERROR_NOTIFIED, an);
 msg =
 "The observed attribute must be accessible in " +
 "the observed object.";
-MONITOR_LOGGER.logp(Level.FINEST,
+MONITOR_LOGGER.log(Level.TRACE, msg);
-Monitor.class.getName(), "monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, e::toString);
-MONITOR_LOGGER.logp(Level.FINEST,
-Monitor.class.getName(), "monitor", e.toString());
 }
 } catch (RuntimeException e) {
 if (isAlreadyNotified(o, RUNTIME_ERROR_NOTIFIED))
 return;
 else {
 notifType = RUNTIME_ERROR;
 setAlreadyNotified(o, index,
 RUNTIME_ERROR_NOTIFIED, an);
 msg = e.getMessage() == null ? "" : e.getMessage();
-MONITOR_LOGGER.logp(Level.FINEST,
+MONITOR_LOGGER.log(Level.TRACE, msg);
-Monitor.class.getName(), "monitor", msg);
+MONITOR_LOGGER.log(Level.TRACE, e::toString);
-MONITOR_LOGGER.logp(Level.FINEST,
-Monitor.class.getName(), "monitor", e.toString());
 }
 }
 }
 // Check that the observed attribute type is supported by this
 else {
 notifType = OBSERVED_ATTRIBUTE_TYPE_ERROR;
 setAlreadyNotified(o, index,
 OBSERVED_ATTRIBUTE_TYPE_ERROR_NOTIFIED, an);
 msg = "The observed attribute type is not valid.";
-MONITOR_LOGGER.logp(Level.FINEST,
+MONITOR_LOGGER.log(Level.TRACE, msg);
-Monitor.class.getName(), "monitor", msg);
 }
 }
 }
 // Check that threshold type is supported by this monitor.
 else {
 notifType = THRESHOLD_ERROR;
 setAlreadyNotified(o, index,
 THRESHOLD_ERROR_NOTIFIED, an);
 msg = "The threshold type is not valid.";
-MONITOR_LOGGER.logp(Level.FINEST,
+MONITOR_LOGGER.log(Level.TRACE, msg);
-Monitor.class.getName(), "monitor", msg);
 }
 }
 }
 // Let someone subclassing the monitor to perform additional
 return;
 else {
 notifType = RUNTIME_ERROR;
 setAlreadyNotified(o, index,
 RUNTIME_ERROR_NOTIFIED, an);
-MONITOR_LOGGER.logp(Level.FINEST,
+MONITOR_LOGGER.log(Level.TRACE, msg);
-Monitor.class.getName(), "monitor", msg);
 }
 }
 }
 // If no errors were found then clear all error flags and

changeset 43235	da1786d695b6
parent 37518	cd27455e4276