From 0c420346e4dc64975d53b507adf5871d486678ff Mon Sep 17 00:00:00 2001
From: mchung <unknown>
Date: Thu, 7 Feb 2013 09:41:47 -0800
Subject: [PATCH] 8007611: logging behavior in applet changed Reviewed-by:
 alanb, jgish

---
 src/share/classes/java/util/logging/LogManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/share/classes/java/util/logging/LogManager.java b/src/share/classes/java/util/logging/LogManager.java
index 55b2f206e..40537d2e4 100644
--- a/src/share/classes/java/util/logging/LogManager.java
+++ b/src/share/classes/java/util/logging/LogManager.java
@@ -395,7 +395,10 @@ public class LogManager {
                         context = userContext;
                     } else {
                         context = new LoggerContext();
-                        context.addLocalLogger(manager.rootLogger);
+                        // during initialization, rootLogger is null when
+                        // instantiating itself RootLogger
+                        if (manager.rootLogger != null)
+                            context.addLocalLogger(manager.rootLogger);
                     }
                     javaAwtAccess.put(ecx, LoggerContext.class, context);
                 }
-- 
GitLab