This patch fixes bug 30154.

Changelog:

2006-12-12  Andrew John Hughes  <[EMAIL PROTECTED]>

        PR classpath/30154:
        * javax/management/MBeanServer.java:
        (createMBeanServer(String)): Check for a null
        builder.

-- 
Andrew :-)

Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: javax/management/MBeanServerFactory.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/management/MBeanServerFactory.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 MBeanServerFactory.java
--- javax/management/MBeanServerFactory.java    10 Dec 2006 17:44:33 -0000      
1.2
+++ javax/management/MBeanServerFactory.java    12 Dec 2006 01:24:24 -0000
@@ -336,7 +336,8 @@ public class MBeanServerFactory
            builder.getClass() != MBeanServerBuilder.class)
          builder = new MBeanServerBuilder();
       }
-    else if (!(builderClass.equals(builder.getClass().getName())))
+    else if (!(builder != null &&
+              builderClass.equals(builder.getClass().getName())))
       {
        ClassLoader cl = Thread.currentThread().getContextClassLoader();
        if (cl == null)

Attachment: signature.asc
Description: Digital signature

Reply via email to