Mercurial > hg > release > icedtea6-1.12
view patches/openjdk/8010727-empty_logger_name.patch @ 3010:079a280bf354
Additional fixes that go along with the security update
Backport additional fixes from 7 that went along with the security
update.
2013-07-03 Omair Majid <omajid@redhat.com>
* patches/openjdk/6541350-tz_display_names_l10n.patch,
* patches/openjdk/6821191-tz_display_names_l10n.patch,
* patches/openjdk/6977550-tzdata2010l.patch,
* patches/openjdk/6996686-tzdata2010o.patch,
* patches/openjdk/7017800-tzdata2011b.patch,
* patches/openjdk/7027387-tzdata2011d.patch,
* patches/openjdk/7033174-tzdata2011e.patch,
* patches/openjdk/7039469-tzdata2011g.patch,
* patches/openjdk/7090843-tzdata2011j.patch,
* patches/openjdk/7103108-tzdata2011l.patch,
* patches/openjdk/7103405-correct_display_names.patch,
* patches/openjdk/7104126-headers_tzdata.patch,
* patches/openjdk/7158483-tzdata2012c.patch,
* patches/openjdk/7198570-tzdata2012f.patch,
* patches/openjdk/8002070-remove_logger_stack_search.patch,
* patches/openjdk/8002070-remove_logger_stack_search_2.patch,
* patches/openjdk/8002225-tzdata2012i.patch,
* patches/openjdk/8009987-tzdata2013b.patch,
* patches/openjdk/8009996-emitter_bean.patch,
* patches/openjdk/8010118-caller_sensitive.patch,
* patches/openjdk/8010727-empty_logger_name.patch,
* patches/openjdk/8010939-logmanager_deadlock.patch,
* patches/openjdk/8011139-revise_checking_getenclosingclass.patch,
* patches/openjdk/8011990-logger_test_urls.patch,
* patches/openjdk/8012243-serial_regression.patch,
* patches/openjdk/8013380-handle_renames.patch,
* patches/openjdk/8013380-logger_stack_walk_glassfish.patch,
* patches/openjdk/8014718-remove_logging_suntoolkit.patch,
* patches/openjdk/8014745-logger_stack_walk_switch.patch:
New file. Backport from icedtea/openjdk 7.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* NEWS: Update with fixes.
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Wed, 03 Jul 2013 23:28:46 -0400 |
parents | |
children | dfef77966f7c |
line wrap: on
line source
# HG changeset patch # User mchung # Date 1368544028 25200 # Node ID 776ac4b51f1538de78054f7774b9bbefc91374cb # Parent 0d497f17e31b82d42b5ae0a26e6636ee9ea65887 8010727: WLS fails to add a logger with "" in its own LogManager subclass instance Reviewed-by: alanb, jgish --- openjdk/jdk/src/share/classes/java/util/logging/LogManager.java +++ openjdk/jdk/src/share/classes/java/util/logging/LogManager.java @@ -496,7 +496,7 @@ } synchronized void ensureRootLogger(Logger logger) { - if (logger == manager.rootLogger) + if (logger.getName().isEmpty()) return; // during initialization, rootLogger is null when new file mode 100644 --- /dev/null +++ openjdk/jdk/test/java/util/logging/LogManagerInstanceTest.java @@ -0,0 +1,76 @@ +/* + * Copyright (c) 2013, 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.util.logging.*; + +/* + * @test + * @bug 8010727 + * @summary LogManager.addLogger should succeed to add a logger named "" + * if LogManager.getLogger("") returns null. + * + * @run main LogManagerInstanceTest + */ + +public class LogManagerInstanceTest { + public static void main(String[] argv) { + LogManager mgr = LogManager.getLogManager(); + if (getRootLogger(mgr) == null) { + throw new RuntimeException("Root logger not exist"); + } + + SecondLogManager mgr2 = new SecondLogManager(); + Logger root = getRootLogger(mgr2); + if (mgr2.base != root) { + throw new RuntimeException(mgr2.base + " is not the root logger"); + } + } + + private static Logger getRootLogger(LogManager mgr) { + Logger l = mgr.getLogger(""); + if (l != null && !l.getName().isEmpty()) { + throw new RuntimeException(l.getName() + " is not an invalid root logger"); + } + return l; + } + + static class SecondLogManager extends LogManager { + final Logger base; + private SecondLogManager() { + Logger root = getLogger(""); + if (root == null) { + root = new BaseLogger("", null); + if (!super.addLogger(root)) + throw new RuntimeException("Fail to addLogger " + root); + } else { + System.out.println("Root logger already exists"); + } + this.base = root; + } + } + static class BaseLogger extends Logger { + BaseLogger(String name, String rbname) { + super(name, rbname); + } + } +}