1 files changed, 97 insertions, 5 deletions

diff --git a/javax/management/ObjectName.java b/javax/management/ObjectName.java
index 04fa33a82..00a2a2875 100644
--- a/javax/management/ObjectName.java
+++ b/javax/management/ObjectName.java
@@ -45,6 +45,11 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
 
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
 /**
  * <p>
  * An {@link ObjectName} instance represents the name of a management
@@ -97,30 +102,56 @@ public class ObjectName
   implements Serializable, QueryExp
 {
 
+  private static final long serialVersionUID = 1081892073854801359L;
+
+  /**
+   * The wildcard {@link ObjectName} {@code "*:*"}
+   *
+   * @since 1.6
+   */
+  public static final ObjectName WILDCARD;
+
   /**
    * The domain of the name.
    */
-  private String domain;
+  private transient String domain;
 
   /**
    * The properties, as key-value pairs.
    */
-  private TreeMap<String,String> properties = new TreeMap<String,String>();
+  private transient TreeMap<String,String> properties;
 
   /**
    * The properties as a string (stored for ordering).
    */
-  private String propertyListString;
+  private transient String propertyListString;
 
   /**
    * True if this object name is a property pattern.
    */
-  private boolean propertyPattern;
+  private transient boolean propertyPattern;
 
   /**
    * The management server associated with this object name.
    */
-  private MBeanServer server;
+  private transient MBeanServer server;
+
+  /**
+   * Static initializer to set up the wildcard.
+   */
+  static
+  {
+    try
+      {
+	WILDCARD = new ObjectName("");
+      }
+    catch (MalformedObjectNameException e)
+      {
+	throw (InternalError) (new InternalError("A problem occurred " +
+						 "initializing the ObjectName " +
+						 "wildcard.").initCause(e));
+      }
+  }
 
   /**
    * Constructs an {@link ObjectName} instance from the given string,
@@ -145,12 +176,22 @@ public class ObjectName
   {
     if (name.length() == 0)
       name = "*:*";
+    parse(name);
+  }
 
+  /**
+   * Parse the name in the same form as the constructor.  Used by
+   * readObject().
+   */
+  private void parse(String name)
+    throws MalformedObjectNameException
+  {
     int domainSep = name.indexOf(':');
     if (domainSep == -1)
       throw new MalformedObjectNameException("No domain separator was found.");
     domain = name.substring(0, domainSep);
     String rest = name.substring(domainSep + 1);
+    properties = new TreeMap<String,String>();
     if (rest.equals("*"))
       propertyPattern = true;
     else
@@ -202,6 +243,7 @@ public class ObjectName
     throws MalformedObjectNameException
   {
     this.domain = domain;
+    properties = new TreeMap<String,String>();
     properties.put(key, value);
     checkComponents();
   }
@@ -224,6 +266,7 @@ public class ObjectName
     throws MalformedObjectNameException
   {
     this.domain = domain;
+    this.properties = new TreeMap<String,String>();
     this.properties.putAll(properties);
     checkComponents();
   }
@@ -744,6 +787,55 @@ public class ObjectName
     return getCanonicalName();
   }
 
+
+  /**
+   * Serialize this {@link ObjectName}.  The serialized
+   * form is the same as the string parsed by the constructor.
+   *
+   * @param out the output stream to write to.
+   * @throws IOException if an I/O error occurs.
+   */
+  private void writeObject(ObjectOutputStream out)
+    throws IOException
+  {
+    out.defaultWriteObject();
+    StringBuffer buffer = new StringBuffer(getDomain());
+    buffer.append(':');
+    String properties = getKeyPropertyListString();
+    buffer.append(properties);
+    if (isPropertyPattern())
+      {
+       if (properties.length() == 0)
+         buffer.append("*");
+       else
+         buffer.append(",*");
+      }
+    out.writeObject(buffer.toString());
+  }
+
+  /**
+   * Reads the serialized form, which is that used
+   * by the constructor.
+   *
+   * @param in the input stream to read from.
+   * @throws IOException if an I/O error occurs.
+   */
+  private void readObject(ObjectInputStream in) 
+    throws IOException, ClassNotFoundException
+   {
+     in.defaultReadObject();
+     String objectName = (String)in.readObject();
+     try
+       {
+         parse(objectName);
+       }
+     catch (MalformedObjectNameException x)
+       {
+         throw new InvalidObjectException(x.toString());
+       }
+   }
+
+
   /**
    * Unquotes the supplied string.  The quotation marks are removed as
    * are the backslashes preceding the escaped characters ('"', '?',