d6738d6600
The failing tests are refactored to make the custom logger finder class a top-level class. Reviewed-by: dholmes, mchung
53 lines
2.2 KiB
Java
53 lines
2.2 KiB
Java
/*
|
|
* Copyright (c) 2015, 2018, 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.
|
|
*
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
* accompanied this code).
|
|
*
|
|
* You should have received a copy of the GNU General Public License version
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
* questions.
|
|
*/
|
|
|
|
import java.lang.System.Logger;
|
|
import java.lang.System.LoggerFinder;
|
|
import java.security.AccessController;
|
|
import java.security.PrivilegedAction;
|
|
import java.util.concurrent.ConcurrentHashMap;
|
|
|
|
public class LogProducerFinder extends LoggerFinder {
|
|
|
|
public static final RuntimePermission LOGGERFINDER_PERMISSION =
|
|
new RuntimePermission("loggerFinder");
|
|
final ConcurrentHashMap<String, LoggerBridgeTest.LoggerImpl> system = new ConcurrentHashMap<>();
|
|
final ConcurrentHashMap<String, LoggerBridgeTest.LoggerImpl> user = new ConcurrentHashMap<>();
|
|
|
|
@Override
|
|
public Logger getLogger(String name, Module caller) {
|
|
SecurityManager sm = System.getSecurityManager();
|
|
if (sm != null) {
|
|
sm.checkPermission(LOGGERFINDER_PERMISSION);
|
|
}
|
|
PrivilegedAction<ClassLoader> pa = () -> caller.getClassLoader();
|
|
ClassLoader callerLoader = AccessController.doPrivileged(pa);
|
|
if (callerLoader == null) {
|
|
return system.computeIfAbsent(name, (n) -> new LoggerBridgeTest.LoggerImpl(n));
|
|
} else {
|
|
return user.computeIfAbsent(name, (n) -> new LoggerBridgeTest.LoggerImpl(n));
|
|
}
|
|
}
|
|
}
|
|
|