author | dfuchs |
Thu, 02 Apr 2015 16:24:46 +0200 | |
changeset 29740 | d9f64fdd3c97 |
child 30442 | bb6b137056e4 |
permissions | -rw-r--r-- |
29740
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
1 |
/* |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
2 |
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
4 |
* |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
8 |
* |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
13 |
* accompanied this code). |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
14 |
* |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
18 |
* |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
21 |
* questions. |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
22 |
*/ |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
23 |
import java.util.Collections; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
24 |
import java.util.Enumeration; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
25 |
import java.util.Iterator; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
26 |
import java.util.List; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
27 |
import java.util.concurrent.CopyOnWriteArrayList; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
28 |
import java.util.concurrent.Phaser; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
29 |
import java.util.concurrent.Semaphore; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
30 |
import java.util.logging.Handler; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
31 |
import java.util.logging.LogManager; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
32 |
import java.util.logging.Logger; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
33 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
34 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
35 |
/** |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
36 |
* @test |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
37 |
* @bug 7113878 |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
38 |
* @summary This is not a test that will check that 7113878 is fixed, but |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
39 |
* rather a test that will invoke the modified code & try to verify |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
40 |
* that fixing 7113878 has not introduced some big regression. |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
41 |
* This test should pass, whether 7113878 is there or not. |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
42 |
* @run main/othervm TestLoggerNames |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
43 |
* @author danielfuchs |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
44 |
*/ |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
45 |
public class TestLoggerNames { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
46 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
47 |
static final class TestLogger extends java.util.logging.Logger { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
48 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
49 |
final Semaphore sem = new Semaphore(0); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
50 |
final Semaphore wait = new Semaphore(0); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
51 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
52 |
public TestLogger(String name, String resourceBundleName) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
53 |
super(name, resourceBundleName); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
54 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
55 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
56 |
@Override |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
57 |
public Handler[] getHandlers() { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
58 |
boolean found = false; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
59 |
try { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
60 |
System.out.println("Entering "+getName()+" getHandlers()"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
61 |
for (StackTraceElement ste : Thread.currentThread().getStackTrace()) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
62 |
if (LogManager.class.getName().equals(ste.getClassName()) |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
63 |
&& "reset".equals(ste.getMethodName())) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
64 |
found = true; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
65 |
System.out.println(getName()+" getHandlers() called by " + ste); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
66 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
67 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
68 |
sem.release(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
69 |
try { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
70 |
System.out.println("TestLogger: Acquiring wait for "+getName()); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
71 |
wait.acquire(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
72 |
try { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
73 |
System.out.println("TestLogger: Acquired wait for "+getName()); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
74 |
return super.getHandlers(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
75 |
} finally { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
76 |
System.out.println("TestLogger: Releasing wait for "+getName()); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
77 |
wait.release(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
78 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
79 |
} finally { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
80 |
System.out.println("Unblocking "+getName()); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
81 |
sem.acquire(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
82 |
System.out.println("Unblocked "+getName()); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
83 |
if (found) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
84 |
System.out.println("Reset will proceed..."); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
85 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
86 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
87 |
} catch (InterruptedException x) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
88 |
throw new IllegalStateException(x); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
89 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
90 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
91 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
92 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
93 |
static volatile boolean stop; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
94 |
static volatile Throwable resetFailed; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
95 |
static volatile Throwable checkLoggerNamesFailed; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
96 |
static volatile Phaser phaser = new Phaser(2); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
97 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
98 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
99 |
static void checkLoggerNames(List<Logger> loggers) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
100 |
Enumeration<String> names = LogManager.getLogManager().getLoggerNames(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
101 |
if (names instanceof Iterator) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
102 |
for (Iterator<?> it = Iterator.class.cast(names); it.hasNext(); ) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
103 |
try { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
104 |
it.remove(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
105 |
throw new RuntimeException("Iterator supports remove!"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
106 |
} catch (UnsupportedOperationException x) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
107 |
System.out.println("OK: Iterator doesn't support remove."); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
108 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
109 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
110 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
111 |
List<String> loggerNames = Collections.list(names); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
112 |
if (!loggerNames.contains("")) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
113 |
throw new RuntimeException("\"\"" + |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
114 |
" not found in " + loggerNames); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
115 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
116 |
if (!loggerNames.contains("global")) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
117 |
throw new RuntimeException("global" + |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
118 |
" not found in " + loggerNames); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
119 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
120 |
for (Logger l : loggers) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
121 |
if (!loggerNames.contains(l.getName())) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
122 |
throw new RuntimeException(l.getName() + |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
123 |
" not found in " + loggerNames); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
124 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
125 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
126 |
System.out.println("Got all expected logger names"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
127 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
128 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
129 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
130 |
public static void main(String[] args) throws InterruptedException { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
131 |
LogManager.getLogManager().addLogger(new TestLogger("com.foo.bar.zzz", null)); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
132 |
try { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
133 |
Logger.getLogger(null); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
134 |
throw new RuntimeException("Logger.getLogger(null) didn't throw expected NPE"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
135 |
} catch (NullPointerException x) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
136 |
System.out.println("Got expected NullPointerException for Logger.getLogger(null)"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
137 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
138 |
List<Logger> loggers = new CopyOnWriteArrayList<>(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
139 |
loggers.add(Logger.getLogger("one.two.addMeAChild")); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
140 |
loggers.add(Logger.getLogger("aaa.bbb.replaceMe")); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
141 |
loggers.add(Logger.getLogger("bbb.aaa.addMeAChild")); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
142 |
TestLogger test = (TestLogger)Logger.getLogger("com.foo.bar.zzz"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
143 |
loggers.add(Logger.getLogger("ddd.aaa.addMeAChild")); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
144 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
145 |
checkLoggerNames(loggers); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
146 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
147 |
Thread loggerNamesThread = new Thread(() -> { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
148 |
try { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
149 |
while (!stop) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
150 |
checkLoggerNames(loggers); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
151 |
Thread.sleep(10); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
152 |
if (!stop) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
153 |
phaser.arriveAndAwaitAdvance(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
154 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
155 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
156 |
} catch (Throwable t) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
157 |
t.printStackTrace(System.err); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
158 |
checkLoggerNamesFailed = t; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
159 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
160 |
}, "loggerNames"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
161 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
162 |
Thread resetThread = new Thread(() -> { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
163 |
try { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
164 |
System.out.println("Calling reset..."); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
165 |
LogManager.getLogManager().reset(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
166 |
System.out.println("Reset done..."); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
167 |
System.out.println("Reset again..."); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
168 |
LogManager.getLogManager().reset(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
169 |
System.out.println("Reset done..."); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
170 |
} catch(Throwable t) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
171 |
resetFailed = t; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
172 |
System.err.println("Unexpected exception or error in reset Thread"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
173 |
t.printStackTrace(System.err); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
174 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
175 |
}, "reset"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
176 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
177 |
resetThread.setDaemon(true); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
178 |
resetThread.start(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
179 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
180 |
System.out.println("Waiting for reset to get handlers"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
181 |
test.sem.acquire(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
182 |
try { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
183 |
loggerNamesThread.start(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
184 |
System.out.println("Reset has called getHandlers on " + test.getName()); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
185 |
int i = 0; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
186 |
for (Enumeration<String> e = LogManager.getLogManager().getLoggerNames(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
187 |
e.hasMoreElements();) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
188 |
String name = e.nextElement(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
189 |
if (name.isEmpty()) continue; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
190 |
if (name.endsWith(".addMeAChild")) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
191 |
Logger l = Logger.getLogger(name+".child"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
192 |
loggers.add(l); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
193 |
System.out.println("*** Added " + l.getName()); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
194 |
i++; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
195 |
} else if (name.endsWith("replaceMe")) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
196 |
Logger l = Logger.getLogger(name); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
197 |
loggers.remove(l); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
198 |
l = Logger.getLogger(name.replace("replaceMe", "meReplaced")); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
199 |
loggers.add(l); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
200 |
System.gc(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
201 |
if (LogManager.getLogManager().getLogger(name) == null) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
202 |
System.out.println("*** "+ name + " successfully replaced with " + l.getName()); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
203 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
204 |
i++; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
205 |
} else { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
206 |
System.out.println("Nothing to do for logger: " + name); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
207 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
208 |
phaser.arriveAndAwaitAdvance(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
209 |
if (i >= 3 && i++ == 3) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
210 |
System.out.println("Loggers are now: " + |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
211 |
Collections.list(LogManager.getLogManager().getLoggerNames())); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
212 |
test.wait.release(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
213 |
test.sem.release(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
214 |
System.out.println("Joining " + resetThread); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
215 |
resetThread.join(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
216 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
217 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
218 |
} catch (RuntimeException | InterruptedException | Error x) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
219 |
test.wait.release(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
220 |
test.sem.release(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
221 |
throw x; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
222 |
} finally { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
223 |
stop = true; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
224 |
phaser.arriveAndDeregister(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
225 |
loggerNamesThread.join(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
226 |
loggers.clear(); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
227 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
228 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
229 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
230 |
if (resetFailed != null || checkLoggerNamesFailed != null) { |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
231 |
RuntimeException r = new RuntimeException("Some of the concurrent threads failed"); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
232 |
if (resetFailed != null) r.addSuppressed(resetFailed); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
233 |
if (checkLoggerNamesFailed != null) r.addSuppressed(checkLoggerNamesFailed); |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
234 |
throw r; |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
235 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
236 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
237 |
} |
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
238 |
|
d9f64fdd3c97
7113878: LogManager - namedLoggers should be ConcurrentHashMap instead of Hashtable
dfuchs
parents:
diff
changeset
|
239 |
} |