+2007-04-16 Andrew Haley <aph@redhat.com>
+
+ * org/omg/IOP/TaggedComponentHelper.java (read): Use
+ read_octet_array(), not read().
+ (write): Use write_octet_array(), not write().
+
+ * org/omg/PortableServer/Servant.java (_get_delegate): Throw if no
+ delegate has been set.
+
+ * javax/management/ObjectName.java serialVersionUID: Declare.
+ Make all fields transient.
+ (parse): Break out from constructor.
+ (writeObject, readObject): New methods.
+
2007-04-02 Keith Seitz <keiths@redhat.com>
* gnu/classpath/jdwp/event/ThreadStartEvent.java (Event):
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
implements Serializable, QueryExp
{
+ private static final long serialVersionUID = 1081892073854801359L;
+
/**
* 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;
/**
* Constructs an {@link ObjectName} instance from the given string,
{
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
throws MalformedObjectNameException
{
this.domain = domain;
+ properties = new TreeMap<String,String>();
properties.put(key, value);
checkComponents();
}
throws MalformedObjectNameException
{
this.domain = domain;
+ this.properties = new TreeMap<String,String>();
this.properties.putAll(properties);
checkComponents();
}
return getCanonicalName();
}
+
+ /**
+ * Serialization methods. The serialized form is the same as the
+ * string parsed by the constructor.
+ */
+
+ 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());
+ }
+
+ 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 ('"', '?',
{
TaggedComponent value = new TaggedComponent();
value.tag = input.read_long();
- value.component_data = new byte[input.read_long()];
- try
- {
- input.read(value.component_data);
- }
- catch (IOException e)
- {
- MARSHAL m = new MARSHAL();
- m.minor = Minor.Encapsulation;
- m.initCause(e);
- throw m;
- }
+ int length = input.read_long();
+ value.component_data = new byte[length];
+ input.read_octet_array(value.component_data, 0, length);
return value;
}
{
output.write_long(value.tag);
output.write_long(value.component_data.length);
-
- try
- {
- output.write(value.component_data);
- }
- catch (IOException e)
- {
- MARSHAL m = new MARSHAL();
- m.minor = Minor.Encapsulation;
- m.initCause(e);
- throw m;
- }
+ output.write_octet_array(value.component_data, 0, value.component_data.length);
}
}
\ No newline at end of file