diff options
| author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-08 16:05:13 +0000 |
|---|---|---|
| committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-02-08 16:05:13 +0000 |
| commit | c8a78da7c5712909dc6ba58444c4de5ce23773e5 (patch) | |
| tree | 061d54e269ebcb48460612c4fe66b81605ab3d14 /libjava | |
| parent | a63f3f1ddc88d0ae5b07190d50d0be4bd3b8f639 (diff) | |
| download | ppe42-gcc-c8a78da7c5712909dc6ba58444c4de5ce23773e5.tar.gz ppe42-gcc-c8a78da7c5712909dc6ba58444c4de5ce23773e5.zip | |
2007-02-08 Gary Benson <gbenson@redhat.com>
* javax/management/MBeanServerFactory.java
(servers): Initialize.
(createMBeanServer): Don't initialize servers.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121713 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 6 | ||||
| -rw-r--r-- | libjava/classpath/javax/management/MBeanServerFactory.java | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index eeddf215781..9349f37d98a 100644 --- 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 accbc56fc78..8b27c46e8d7 100644 --- 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 |
