* java/util/logging/Logger.java (global): Initialize inside static

       PrivilegedAction.

2 files changed, 21 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ed8a697d9..0a214d554 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-05-11  Mark Wielaard  <mark@klomp.org>
 
+	* java/util/logging/Logger.java (global): Initialize inside static
+	PrivilegedAction.
+
+2006-05-11  Mark Wielaard  <mark@klomp.org>
+
 	* java/awt/geom/GeneralPath.java (WIND_EVEN_ODD, WIND_NON_ZERO):
 	Fully qualify PathIterator constants
 
diff --git a/java/util/logging/Logger.java b/java/util/logging/Logger.java
index 567020ef7..29f19e440 100644
--- a/java/util/logging/Logger.java
+++ b/java/util/logging/Logger.java
@@ -41,6 +41,8 @@ package java.util.logging;
 import java.util.List;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
 
 /**
  * A Logger is used for logging information about events. Usually, there
@@ -76,7 +78,20 @@ public class Logger
    * products are supposed to create and use their own Loggers, so
    * they can be controlled individually.
    */
-  public static final Logger global = getLogger("global");
+  public static final Logger global;
+
+  static
+    {
+      // Our class might be initialized from an unprivileged context
+      global = (Logger) AccessController.doPrivileged
+	(new PrivilegedAction()
+	  {
+	    public Object run()
+	    {
+	      return getLogger("global");
+	    }
+	  });
+    }
 
 
   /**