--- old/src/share/classes/javax/sql/rowset/serial/SerialArray.java 2012-11-02 18:37:40.000000000 -0400 +++ new/src/share/classes/javax/sql/rowset/serial/SerialArray.java 2012-11-02 18:37:39.000000000 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -29,7 +29,7 @@ import java.io.*; import java.util.Map; import java.net.URL; - +import java.util.Arrays; /** * A serialized version of an Array @@ -525,6 +525,97 @@ } /** + * Compares this SerialArray to the specified object. The result is {@code + * true} if and only if the argument is not {@code null} and is a {@code + * SerialArray} object whose elements are identical to this object's elements + * + * @param obj The object to compare this {@code SerialArray} against + * + * @return {@code true} if the given object represents a {@code SerialArray} + * equivalent to this SerialArray, {@code false} otherwise + * + */ + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + + if (obj instanceof SerialArray) { + SerialArray sa = (SerialArray)obj; + if(baseType == sa.baseType && baseTypeName.equals(sa.baseTypeName)) { + return Arrays.equals(elements, sa.elements); + } + } + return false; + } + + /** + * Returns a hash code for this SerialArray. The hash code for a + * {@code SerialArray} object is computed using the hash codes + * of the elements of the {@code SerialArray} object + * + * @return a hash code value for this object. + */ + public int hashCode() { + return (((31 + Arrays.hashCode(elements)) * 31 + len) * 31 + + baseType) * 31 + baseTypeName.hashCode(); + } + + /** + * Returns a clone of this {@code SerialArray}. The copy will contain a + * reference to a clone of the underlying objects array, not a reference + * to the original underlying object array of this {@code SerialArray} object. + * + * @return a clone of this SerialArray + */ + public Object clone() { + try { + SerialArray sa = (SerialArray) super.clone(); + sa.elements = Arrays.copyOf(elements, len); + return sa; + } catch (CloneNotSupportedException ex) { + // this shouldn't happen, since we are Cloneable + throw new InternalError(); + } + + } + + /** + * readObject is called to restore the state of the {@code SerialArray} from + * a stream. + */ + private void readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException { + + ObjectInputStream.GetField fields = s.readFields(); + Object[] tmp = (Object[])fields.get("elements", null); + if (tmp == null) + throw new InvalidObjectException("elements is null and should not be!"); + elements = tmp.clone(); + len = fields.get("len", 0); + if(elements.length != len) + throw new InvalidObjectException("elements is not the expected size"); + + baseType = fields.get("baseType", 0); + baseTypeName = (String)fields.get("baseTypeName", null); + } + + /** + * writeObject is called to save the state of the {@code SerialArray} + * to a stream. + */ + private void writeObject(ObjectOutputStream s) + throws IOException, ClassNotFoundException { + + ObjectOutputStream.PutField fields = s.putFields(); + fields.put("elements", elements); + fields.put("len", len); + fields.put("baseType", baseType); + fields.put("baseTypeName", baseTypeName); + s.writeFields(); + } + + /** * The identifier that assists in the serialization of this SerialArray * object. */ --- old/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java 2012-11-02 18:37:41.000000000 -0400 +++ new/src/share/classes/javax/sql/rowset/serial/SerialDatalink.java 2012-11-02 18:37:40.000000000 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -100,6 +100,72 @@ return aURL; } + /** + * Compares this {@code SerialDatalink} to the specified object. + * The result is {@code true} if and only if the argument is not + * {@code null} and is a {@code SerialDatalink} object whose URL is + * identical to this object's URL + * + * @param obj The object to compare this {@code SerialDatalink} against + * + * @return {@code true} if the given object represents a {@code SerialDatalink} + * equivalent to this SerialDatalink, {@code false} otherwise + * + */ + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (obj instanceof SerialDatalink) { + SerialDatalink sdl = (SerialDatalink) obj; + return url.equals(sdl.url); + } + return false; + } + + /** + * Returns a hash code for this {@code SerialDatalink}. The hash code for a + * {@code SerialDatalink} object is taken as the hash code of + * the {@code URL} it stores + * + * @return a hash code value for this object. + */ + public int hashCode() { + return 31 + url.hashCode(); + } + + /** + * Returns a clone of this {@code SerialDatalink}. + * + * @return a clone of this SerialDatalink + */ + public Object clone() { + try { + SerialDatalink sdl = (SerialDatalink) super.clone(); + return sdl; + } catch (CloneNotSupportedException ex) { + // this shouldn't happen, since we are Cloneable + throw new InternalError(); + } + } + + /** + * readObject is called to restore the state of the {@code SerialDatalink} + * from a stream. + */ + private void readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException { + s.defaultReadObject(); + } + + /** + * writeObject is called to save the state of the {@code SerialDatalink} + * to a stream. + */ + private void writeObject(ObjectOutputStream s) + throws IOException { + s.defaultWriteObject(); + } /** * The identifier that assists in the serialization of this SerialDatalink --- old/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java 2012-11-02 18:37:42.000000000 -0400 +++ new/src/share/classes/javax/sql/rowset/serial/SerialJavaObject.java 2012-11-02 18:37:41.000000000 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,8 @@ import java.io.*; import java.lang.reflect.*; +import java.util.Arrays; +import java.util.Vector; import javax.sql.rowset.RowSetWarning; /** @@ -49,7 +51,7 @@ /** * Placeholder for object to be serialized. */ - private final Object obj; + private Object obj; /** @@ -132,7 +134,7 @@ } /** - * The identifier that assists in the serialization of this + * The identifier that assists in the serialization of this * SerialJavaObject object. */ static final long serialVersionUID = -1465795139032831023L; @@ -142,15 +144,96 @@ * object. When there are multiple warnings, each warning is chained to the * previous warning. */ - java.util.Vector chain; + Vector chain; + + /** + * Compares this SerialJavaObject to the specified object. + * The result is {@code true} if and only if the argument + * is not {@code null} and is a {@code SerialJavaObject} + * object that is identical to this object + * + * @param o The object to compare this {@code SerialJavaObject} against + * + * @return {@code true} if the given object represents a {@code SerialJavaObject} + * equivalent to this SerialJavaObject, {@code false} otherwise + * + */ + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o instanceof SerialJavaObject) { + if(this.obj.equals( ((SerialJavaObject)o).obj)) + return true; + } + return false; + } + + /** + * Returns a hash code for this SerialJavaObject. The hash code for a + * {@code SerialJavaObject} object is taken as the hash code of + * the {@code Object} it stores + * + * @return a hash code value for this object. + */ + public int hashCode() { + return 31 + obj.hashCode(); + } + + /** + * Returns a clone of this {@code SerialJavaObject}. + * + * @return a clone of this SerialJavaObject + */ + + public Object clone() { + try { + SerialJavaObject sjo = (SerialJavaObject) super.clone(); + sjo.fields = Arrays.copyOf(fields, fields.length); + if (chain != null) + sjo.chain = new Vector(chain); + return sjo; + } catch (CloneNotSupportedException ex) { + // this shouldn't happen, since we are Cloneable + throw new InternalError(); + } + } /** * Registers the given warning. */ private void setWarning(RowSetWarning e) { if (chain == null) { - chain = new java.util.Vector<>(); + chain = new Vector(); } chain.add(e); } + + /** + * readObject is called to restore the state of the {@code SerialJavaObject} + * from a stream. + */ + private void readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException { + + ObjectInputStream.GetField fields1 = s.readFields(); + @SuppressWarnings("unchecked") + Vector tmp = (Vector)fields1.get("chain", null); + if (tmp != null) + chain = new Vector(tmp); + obj = fields1.get("obj", null); + fields = obj.getClass().getFields(); + } + + /** + * writeObject is called to save the state of the {@code SerialJavaObject} + * to a stream. + */ + private void writeObject(ObjectOutputStream s) + throws IOException { + ObjectOutputStream.PutField fields = s.putFields(); + fields.put("obj", obj); + fields.put("chain", chain); + s.writeFields(); + } } --- old/src/share/classes/javax/sql/rowset/serial/SerialRef.java 2012-11-02 18:37:43.000000000 -0400 +++ new/src/share/classes/javax/sql/rowset/serial/SerialRef.java 2012-11-02 18:37:43.000000000 -0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -163,7 +163,86 @@ } /** - * The identifier that assists in the serialization of this SerialRef + * Compares this SerialRef to the specified object. The result is {@code + * true} if and only if the argument is not {@code null} and is a {@code + * SerialRef} object that represents the same object as this + * object. + * + * @param obj The object to compare this {@code SerialRef} against + * + * @return {@code true} if the given object represents a {@code SerialRef} + * equivalent to this SerialRef, {@code false} otherwise + * + */ + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if(obj instanceof SerialRef) { + SerialRef ref = (SerialRef)obj; + if(baseTypeName.equals(ref.baseTypeName)) { + return object.equals(ref.object); + } + } + return false; + } + + /** + * Returns a hash code for this {@code SerialRef}. + * @return a hash code value for this object. + */ + public int hashCode() { + return (31 + object.hashCode()) * 31 + baseTypeName.hashCode(); + } + + /** + * Returns a clone of this {@code SerialRef}. . + * The underlying {@code Ref} object will be set to null. + * + * @return a clone of this SerialRef + */ + public Object clone() { + try { + SerialRef ref = (SerialRef) super.clone(); + ref.reference = null; + return ref; + } catch (CloneNotSupportedException ex) { + // this shouldn't happen, since we are Cloneable + throw new InternalError(); + } + + } + + /** + * readObject is called to restore the state of the SerialRef from + * a stream. + */ + private void readObject(ObjectInputStream s) + throws IOException, ClassNotFoundException { + ObjectInputStream.GetField fields = s.readFields(); + object = fields.get("object", null); + baseTypeName = (String) fields.get("baseTypeName", null); + reference = (Ref) fields.get("reference", null); + } + + /** + * writeObject is called to save the state of the SerialRef + * to a stream. + */ + private void writeObject(ObjectOutputStream s) + throws IOException, ClassNotFoundException { + + ObjectOutputStream.PutField fields = s.putFields(); + fields.put("baseTypeName", baseTypeName); + fields.put("object", object); + // Note: this check to see if it is an instance of Serializable + // is for backwards compatibiity + fields.put("reference", reference instanceof Serializable ? reference : null); + s.writeFields(); + } + + /** + * The identifier that assists in the serialization of this SerialRef * object. */ static final long serialVersionUID = -4727123500609662274L;