2007-02-08 Gary Benson <gbenson@redhat.com>

	* javax/management/MBeanServerFactory.java
	(servers): Initialize.
	(createMBeanServer): Don't initialize servers.

From-SVN: r121713

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index eeddf215781e08fa4acc734eba8098edf3141157..9349f37d98acf17405c3c38b183ed5edf10c6f9e 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,9 @@
+2007-02-08  Gary Benson  <gbenson@redhat.com>
+
+       * javax/management/MBeanServerFactory.java
+       (servers): Initialize.
+       (createMBeanServer): Don't initialize servers.
+
 2007-01-31  Tom Tromey  <tromey@redhat.com>
 
        * tools/Makefile.in: Rebuilt.

diff --git a/libjava/classpath/javax/management/MBeanServerFactory.java b/libjava/classpath/javax/management/MBeanServerFactory.java
index accbc56fc780712a3572ab8443f67261501c1b84..8b27c46e8d7f9733300d59ccc0379d27568bd9bd 100644 (file)
--- a/libjava/classpath/javax/management/MBeanServerFactory.java
+++ b/libjava/classpath/javax/management/MBeanServerFactory.java
@@ -1,5 +1,5 @@
 /* MBeanServerFactory.java -- Manages server instances.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -89,7 +89,7 @@ public class MBeanServerFactory
   /**
    * The map of registered servers (identifiers to servers).
    */
-  private static Map servers;
+  private static Map servers = new HashMap();
 
   /**
    * Private constructor to prevent instance creation.
@@ -158,8 +158,6 @@ public class MBeanServerFactory
     if (sm != null)
       sm.checkPermission(new MBeanServerPermission("createMBeanServer"));
     MBeanServer server = createServer(domain);
-    if (servers == null)
-      servers = new HashMap();
     try
       {
        ObjectName dn = new