--- old/src/share/classes/javax/sql/rowset/serial/SerialBlob.java 2012-10-29 14:30:28.000000000 -0400
+++ new/src/share/classes/javax/sql/rowset/serial/SerialBlob.java 2012-10-29 14:30:27.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
@@ -28,6 +28,8 @@
import java.sql.*;
import java.io.*;
import java.lang.reflect.*;
+import java.util.Arrays;
+import java.util.Objects;
/**
@@ -448,6 +450,99 @@
public void free() throws SQLException {
throw new java.lang.UnsupportedOperationException("Not supported");
}
+
+ /**
+ * Compares this SerialBlob to the specified object. The result is {@code
+ * true} if and only if the argument is not {@code null} and is a {@code
+ * SerialBlob} object that represents the same sequence of bytes as this
+ * object.
+ *
+ * @param obj
+ * The object to compare this {@code SerialBlob} against
+ *
+ * @return {@code true} if the given object represents a {@code SerialBlob}
+ * equivalent to this SerialBlob, {@code false} otherwise
+ *
+ */
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if(obj == null || !(obj instanceof SerialBlob)) {
+ return false;
+ }
+
+ SerialBlob sb = (SerialBlob)obj;
+ if(this.len == sb.len) {
+ return Arrays.equals(buf, sb.buf);
+ }
+ return false;
+ }
+
+ /**
+ * Returns a hash code for this {@code SerialBlob}.
+ * @return a hash code value for this object.
+ */
+ public int hashCode() {
+ return Objects.hash(buf, len, origLen);
+ }
+
+ /**
+ * Returns a clone of this {@code SerialBlob}. The copy will contain a
+ * reference to a clone of the internal byte array, not a reference
+ * to the original internal byte array of this {@code SerialBlob} object.
+ * The internal {@code Blob} field will be set to null.
+ *
+ * @return a clone of this SerialBlob
+ */
+ public Object clone() {
+ SerialBlob sb = null;
+ try {
+ sb = (SerialBlob) super.clone();
+ sb.buf = Arrays.copyOf(buf, (int)len);
+ sb.blob = null;
+
+ } catch (CloneNotSupportedException ex) {
+ // this shouldn't happen, since we are Cloneable
+ }
+ return sb;
+ }
+
+ /**
+ * readObject is called to restore the state of the SerialBlob from
+ * a stream.
+ */
+ private void readObject(ObjectInputStream s)
+ throws IOException, ClassNotFoundException {
+
+ ObjectInputStream.GetField fields = s.readFields();
+ byte[] tmp = (byte[])fields.get("buf", null);
+ if (tmp == null)
+ throw new InvalidObjectException("buf is null and should not be!");
+ buf = tmp.clone();
+ len = fields.get("len", 0L);
+ origLen = fields.get("origLen", 0L);
+ blob = (Blob) fields.get("blob", null);
+ if(buf.length != len)
+ throw new InvalidObjectException("buf is not the expected size");
+ }
+
+ /**
+ * writeObject is called to save the state of the SerialBlob
+ * to a stream.
+ */
+ private void writeObject(ObjectOutputStream s)
+ throws IOException, ClassNotFoundException {
+
+ ObjectOutputStream.PutField fields = s.putFields();
+ fields.put("buf", buf);
+ fields.put("len", len);
+ fields.put("origLen", origLen);
+ fields.put("blob", null);
+ fields.put("blob", blob instanceof Serializable ? blob : null);
+ s.writeFields();
+ }
+
/**
* The identifier that assists in the serialization of this SerialBlob
* object.
--- old/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2012-10-29 14:30:28.000000000 -0400
+++ new/src/share/classes/javax/sql/rowset/serial/SerialClob.java 2012-10-29 14:30:28.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.sql.*;
import java.io.*;
+import java.util.Arrays;
+import java.util.Objects;
/**
* A serialized mapping in the Java programming language of an SQL
@@ -60,7 +62,7 @@
* Internal Clob representation if SerialClob is initialized with a
* Clob. Null if SerialClob is initialized with a char[].
*/
- private final Clob clob;
+ private Clob clob;
/**
* The length in characters of this SerialClob object's
@@ -76,7 +78,7 @@
*
* @serial
*/
- private final long origLen;
+ private long origLen;
/**
* Constructs a SerialClob object that is a serialized version of
@@ -513,6 +515,96 @@
public void free() throws SQLException {
throw new java.lang.UnsupportedOperationException("Not supported");
}
+ /**
+ * Compares this SerialClob to the specified object. The result is {@code
+ * true} if and only if the argument is not {@code null} and is a {@code
+ * SerialClob} object that represents the same sequence of characters as this
+ * object.
+ *
+ * @param obj
+ * The object to compare this {@code SerialClob} against
+ *
+ * @return {@code true} if the given object represents a {@code SerialClob}
+ * equivalent to this SerialClob, {@code false} otherwise
+ *
+ */
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if(obj == null || !(obj instanceof SerialClob)) {
+ return false;
+ }
+
+ SerialClob sc = (SerialClob)obj;
+ if(this.len == sc.len) {
+ return Arrays.equals(buf, sc.buf);
+ }
+ return false;
+ }
+
+ /**
+ * Returns a hash code for this {@code SerialClob}.
+ * @return a hash code value for this object.
+ */
+ public int hashCode() {
+ return Objects.hash(buf, len, origLen);
+ }
+
+ /**
+ * Returns a clone of this {@code SerialClob}. The copy will contain a
+ * reference to a clone of the internal character array, not a reference
+ * to the original internal character array of this {@code SerialClob} object.
+ * The internal {@code Clob} field will be set to null.
+ *
+ * @return a clone of this SerialClob
+ */
+ public Object clone() {
+ SerialClob sc = null;
+ try {
+ sc = (SerialClob) super.clone();
+ sc.buf = Arrays.copyOf(buf, (int)len);
+ sc.clob = null;
+
+ } catch (CloneNotSupportedException ex) {
+ // this shouldn't happen, since we are Cloneable
+ }
+ return sc;
+ }
+
+ /**
+ * readObject is called to restore the state of the SerialClob from
+ * a stream.
+ */
+ private void readObject(ObjectInputStream s)
+ throws IOException, ClassNotFoundException {
+
+ ObjectInputStream.GetField fields = s.readFields();
+ char[] tmp = (char[])fields.get("buf", null);
+ if (tmp == null)
+ throw new InvalidObjectException("buf is null and should not be!");
+ buf = tmp.clone();
+ len = fields.get("len", 0L);
+ origLen = fields.get("origLen", 0L);
+ clob = (Clob) fields.get("clob", null);
+ if(buf.length != len)
+ throw new InvalidObjectException("buf is not the expected size");
+ }
+
+ /**
+ * writeObject is called to save the state of the SerialClob
+ * to a stream.
+ */
+ private void writeObject(ObjectOutputStream s)
+ throws IOException, ClassNotFoundException {
+
+ ObjectOutputStream.PutField fields = s.putFields();
+ fields.put("buf", buf);
+ fields.put("len", len);
+ fields.put("origLen", origLen);
+ fields.put("clob", clob instanceof Serializable ? clob : null);
+ s.writeFields();
+ }
/**
* The identifier that assists in the serialization of this SerialClob