2007-04-02 Andrew Haley <aph@redhat.com>

        * javax/management/ObjectName.java: Handle 0-length names.
        * javax/management/MBeanServerFactory.java: Use the domain that
        we've been passed, not the fixed string "DefaultDomain".

3 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index f8a1f5136..6e16e25ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-02  Andrew Haley  <aph@redhat.com>
+
+	* javax/management/ObjectName.java: Handle 0-length names.
+	* javax/management/MBeanServerFactory.java: Use the domain that
+	we've been passed, not the fixed string "DefaultDomain".
+
 2007-04-01  Mark Wielaard  <mark@klomp.org>
 
 	* org/omg/CORBA/DynAny.java: Mark as deprecated.
diff --git a/javax/management/MBeanServerFactory.java b/javax/management/MBeanServerFactory.java
index 54195635b..a8dac9489 100644
--- a/javax/management/MBeanServerFactory.java
+++ b/javax/management/MBeanServerFactory.java
@@ -370,7 +370,7 @@ public class MBeanServerFactory
     MBeanServerDelegate delegate = builder.newMBeanServerDelegate();
     if (delegate == null)
       throw new JMRuntimeException("A delegate could not be created.");
-    MBeanServer server = builder.newMBeanServer("DefaultDomain", null, delegate);
+    MBeanServer server = builder.newMBeanServer(domain, null, delegate);
     if (server == null)
       throw new JMRuntimeException("A server could not be created.");
     return server;
diff --git a/javax/management/ObjectName.java b/javax/management/ObjectName.java
index 49d063543..04fa33a82 100644
--- a/javax/management/ObjectName.java
+++ b/javax/management/ObjectName.java
@@ -143,6 +143,9 @@ public class ObjectName
   public ObjectName(String name)
     throws MalformedObjectNameException
   {
+    if (name.length() == 0)
+      name = "*:*";
+
     int domainSep = name.indexOf(':');
     if (domainSep == -1)
       throw new MalformedObjectNameException("No domain separator was found.");