[cp-patches] RFC: Always initialize management.Server.beans

[Mark Wielaard]

Hi,

The beans map in management.Server could be queries before anything was
put into it. Then beans would be null. Leading to nasty exceptions. This
patch makes sure beans is initialized from the start with an empty
HashMap.

2006-12-03  Mark Wielaard  <[EMAIL PROTECTED]>

        * gnu/javax/management/Server.java (beans): Initialize.
        (registerMBean): Don't initialize beans.

Does that look sane?

Thanks,

Mark

diff -u -r1.1 Server.java
--- gnu/javax/management/Server.java    18 Nov 2006 17:21:24 -0000
1.1
+++ gnu/javax/management/Server.java    3 Dec 2006 22:28:41 -0000
@@ -108,7 +108,7 @@
    * [EMAIL PROTECTED] javax.management.ObjectName}s to
    * [EMAIL PROTECTED] java.lang.Object}s.
    */
-  private Map beans;
+  private final Map beans = new HashMap();

   /**
    * The default domain.
@@ -1646,9 +1646,7 @@
            throw new MBeanRegistrationException(e, "Pre-registration
failed.");          }
       }
-    if (beans == null)
-      beans = new HashMap();
-    else if (beans.containsKey(name))
+    if (beans.containsKey(name))
       {
        if (register != null)
          register.postRegister(Boolean.FALSE);

signature.asc
Description: This is a digitally signed message part