diff --git a/src/share/classes/java/util/logging/Logger.java b/src/share/classes/java/util/logging/Logger.java index 28f942a0f2acadf80550ebab3109d141267d29b0..5ae2b42713361f38875dd8141a1c172ebb1861e4 100644 --- a/src/share/classes/java/util/logging/Logger.java +++ b/src/share/classes/java/util/logging/Logger.java @@ -477,7 +477,7 @@ public class Logger { Logger logger = this; while (logger != null) { - for (Handler handler : logger.handlers) { + for (Handler handler : logger.getHandlers()) { handler.publish(record); } diff --git a/test/java/util/logging/LoggerSubclass.java b/test/java/util/logging/LoggerSubclass.java new file mode 100644 index 0000000000000000000000000000000000000000..bd71f11a56669a31326a507d1006c870f260a8c5 --- /dev/null +++ b/test/java/util/logging/LoggerSubclass.java @@ -0,0 +1,98 @@ +/* + * Copyright 2009 Google, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +/* + * @test + * @bug 6830220 + * @summary Test Logger subclasses + */ + +import java.util.logging.Handler; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.logging.LogRecord; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; + +public class LoggerSubclass { + void test(String[] args) { + final String name = "myLogger"; + final String message = "myMessage"; + final AtomicInteger getHandlerCount = new AtomicInteger(0); + final AtomicLong lastSequenceNumber = new AtomicLong(-1L); + final AtomicInteger lastThreadID = new AtomicInteger(-1); + final Logger logger = new Logger(name, null) { + public Handler[] getHandlers() { + getHandlerCount.getAndIncrement(); + return super.getHandlers(); + }}; + equal(logger.getName(), name); + equal(logger.getResourceBundle(), null); + equal(logger.getFilter(), null); + equal(logger.getLevel(), null); + check(logger.isLoggable(Level.WARNING)); + logger.addHandler(new Handler() { + public void close() {} + public void flush() {} + public void publish(LogRecord l) { + equal(l.getLoggerName(), name); + equal(l.getMessage(), message); + equal(l.getResourceBundle(), null); + equal(l.getSourceClassName(), "LoggerSubclass"); + equal(l.getSourceMethodName(), "test"); + equal(l.getThrown(), null); + equal(l.getLevel(), Level.WARNING); + + if (lastSequenceNumber.get() != -1) { + equal(lastSequenceNumber.get() + 1, + l.getSequenceNumber()); + equal(lastThreadID.get(), + l.getThreadID()); + } + lastSequenceNumber.set(l.getSequenceNumber()); + lastThreadID.set(l.getThreadID()); + }}); + for (int i = 1; i < 4; i++) { + logger.warning(message); // Should invoke getHandlers() + equal(i, getHandlerCount.get()); + } + } + + //--------------------- Infrastructure --------------------------- + volatile int passed = 0, failed = 0; + void pass() {passed++;} + void fail() {failed++; Thread.dumpStack();} + void fail(String msg) {System.err.println(msg); fail();} + void unexpected(Throwable t) {failed++; t.printStackTrace();} + void check(boolean cond) {if (cond) pass(); else fail();} + void equal(Object x, Object y) { + if (x == null ? y == null : x.equals(y)) pass(); + else fail(x + " not equal to " + y);} + public static void main(String[] args) throws Throwable { + try {new LoggerSubclass().instanceMain(args);} + catch (Throwable e) {throw e.getCause();}} + public void instanceMain(String[] args) throws Throwable { + try {test(args);} catch (Throwable t) {unexpected(t);} + System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed); + if (failed > 0) throw new AssertionError("Some tests failed");} +}