diff options
| author | Gary Benson <gbenson@redhat.com> | 2007-02-08 16:05:13 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2007-02-08 16:05:13 +0000 |
| commit | f3062b0d1f9cc6f8fdf31fc9e00617e1319d20fa (patch) | |
| tree | 061d54e269ebcb48460612c4fe66b81605ab3d14 /libjava | |
| parent | 674474a525cfedbebb3580b78a008e01c6ff226e (diff) | |
| download | gcc-f3062b0d1f9cc6f8fdf31fc9e00617e1319d20fa.zip gcc-f3062b0d1f9cc6f8fdf31fc9e00617e1319d20fa.tar.gz gcc-f3062b0d1f9cc6f8fdf31fc9e00617e1319d20fa.tar.bz2 | |
2007-02-08 Gary Benson <gbenson@redhat.com>
* javax/management/MBeanServerFactory.java
(servers): Initialize.
(createMBeanServer): Don't initialize servers.
From-SVN: r121713
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 eeddf21..9349f37 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 accbc56..8b27c46 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 |