jdk-sandbox: comparison jdk/src/share/classes/java/util/logging/LogManager.java

equal deleted inserted replaced

-:063cbb0da3d3
+:23714b376286
 *             the caller does not have LoggingPermission("control").
 * @exception NullPointerException if the PropertyChangeListener is null.
 */
 public void addPropertyChangeListener(PropertyChangeListener l) throws SecurityException {
 PropertyChangeListener listener = Objects.requireNonNull(l);
-checkAccess();
+checkPermission();
 synchronized (listenerMap) {
 // increment the registration count if already registered
 Integer value = listenerMap.get(listener);
 value = (value == null) ? 1 : (value + 1);
 listenerMap.put(listener, value);
 * @param l  event listener (can be null)
 * @exception  SecurityException  if a security manager exists and if
 *             the caller does not have LoggingPermission("control").
 */
 public void removePropertyChangeListener(PropertyChangeListener l) throws SecurityException {
-checkAccess();
+checkPermission();
 if (l != null) {
 PropertyChangeListener listener = l;
 synchronized (listenerMap) {
 Integer value = listenerMap.get(listener);
 if (value != null) {
 * @exception  SecurityException  if a security manager exists and if
 *             the caller does not have LoggingPermission("control").
 * @exception  IOException if there are IO problems reading the configuration.
 */
 public void readConfiguration() throws IOException, SecurityException {
-checkAccess();
+checkPermission();
 // if a configuration class is specified, load it and use it.
 String cname = System.getProperty("java.util.logging.config.class");
 if (cname != null) {
 try {
 * @exception  SecurityException  if a security manager exists and if
 *             the caller does not have LoggingPermission("control").
 */
 public void reset() throws SecurityException {
-checkAccess();
+checkPermission();
 synchronized (this) {
 props = new Properties();
 // Since we are doing a reset we no longer want to initialize
 // the global handlers, if they haven't been initialized yet.
 initializedGlobalHandlers = true;
 * @exception  SecurityException  if a security manager exists and if
 *             the caller does not have LoggingPermission("control").
 * @exception  IOException if there are problems reading from the stream.
 */
 public void readConfiguration(InputStream ins) throws IOException, SecurityException {
-checkAccess();
+checkPermission();
 reset();
 // Load the properties
 props.load(ins);
 // Instantiate new configuration objects.
 return;
 }
 loadLoggerHandlers(rootLogger, null, "handlers");
 }
+private final Permission controlPermission = new LoggingPermission("control", null);
-private Permission ourPermission = new LoggingPermission("control", null);
+void checkPermission() {
+SecurityManager sm = System.getSecurityManager();
+if (sm != null)
+sm.checkPermission(controlPermission);
+}
 /**
 * Check that the current context is trusted to modify the logging
 * configuration.  This requires LoggingPermission("control").
 * <p>
 *
 * @exception  SecurityException  if a security manager exists and if
 *             the caller does not have LoggingPermission("control").
 */
 public void checkAccess() throws SecurityException {
-SecurityManager sm = System.getSecurityManager();
+checkPermission();
-if (sm == null) {
-return;
-}
-sm.checkPermission(ourPermission);
 }
 // Nested class to represent a node in our tree of named loggers.
 private static class LogNode {
 HashMap<String,LogNode> children;

changeset 14216	23714b376286
parent 13578	cb435d74ab6b
child 16098	9001e536ab4e
child 14229	40fbffe104bd