jdk-sandbox: comparison jdk/src/share/classes/javax/sql/rowset/serial/SerialClob.java

equal deleted inserted replaced

-:800283ef7d59
+:bafd7b441d80
 * @serial
 */
 private char buf[];
 /**
-* Internal Clob representation if SerialClob is intialized with a
+* Internal Clob representation if SerialClob is initialized with a
-* Clob
+* Clob. Null if SerialClob is initialized with a char[].
 */
-private Clob clob;
+private final Clob clob;
 /**
 * The length in characters of this <code>SerialClob</code> object's
 * internal array of characters.
 *
 * @serial
 */
 private long len;
 /**
-* The original length in characters of tgus <code>SerialClob</code>
+* The original length in characters of this <code>SerialClob</code>
-* objects internal array of characters.
+* object's internal array of characters.
 *
 * @serial
 */
-private long origLen;
+private final long origLen;
 /**
 * Constructs a <code>SerialClob</code> object that is a serialized version of
 * the given <code>char</code> array.
 * <p>
 buf = new char[(int)len];
 for (int i = 0; i < len ; i++){
 buf[i] = ch[i];
 }
 origLen = len;
+clob = null;
 }
 /**
 * Constructs a <code>SerialClob</code> object that is a serialized
 * version of the given <code>Clob</code> object.
 * <code>Clob</code> object should have previously brought the
 * SQL <code>CLOB</code> value's data over to the client from
 * the database. Otherwise, the new <code>SerialClob</code> object
 * object will contain no data.
 * <p>
-* Note: The <code>Clob</code> object supplied to this constructor cannot
+* Note: The <code>Clob</code> object supplied to this constructor must
-* return <code>null</code> for the <code>Clob.getCharacterStream()</code>
+* return non-null for both the <code>Clob.getCharacterStream()</code>
 * and <code>Clob.getAsciiStream</code> methods. This <code>SerialClob</code>
-* constructor cannot  serialize a <code>Clob</code> object in this instance
+* constructor cannot serialize a <code>Clob</code> object in this instance
 * and will throw an <code>SQLException</code> object.
 *
 * @param  clob the <code>Clob</code> object from which this
 *     <code>SerialClob</code> object is to be constructed; cannot be null
 * @throws SerialException if an error occurs during serialization
 * @throws SQLException if a SQL error occurs in capturing the CLOB;
-*     if the <code>Clob</code> object is a null; or if both the
+*     if the <code>Clob</code> object is a null; or if either of the
 *     <code>Clob.getCharacterStream()</code> and <code>Clob.getAsciiStream()</code>
-*     methods on the <code>Clob</code> return a null
+*     methods on the <code>Clob</code> returns a null
 * @see java.sql.Clob
 */
 public SerialClob(Clob clob) throws SerialException, SQLException {
 if (clob == null) {
 this.clob = clob;
 buf = new char[(int)len];
 int read = 0;
 int offset = 0;
-BufferedReader reader;
+try (Reader charStream = clob.getCharacterStream()) {
-if ( (((reader = new BufferedReader(clob.getCharacterStream())) == null)) &&
+if (charStream == null) {
-(clob.getAsciiStream() == null)) {
+throw new SQLException("Invalid Clob object. The call to getCharacterStream " +
-throw new SQLException("Invalid Clob object. Calls to getCharacterStream " +
+"returned null which cannot be serialized.");
-"and getAsciiStream return null which cannot be serialized.");
+}
-}
+// Note: get an ASCII stream in order to null-check it,
-try {
+// even though we don't do anything with it.
-do {
+try (InputStream asciiStream = clob.getAsciiStream()) {
-read = reader.read(buf, offset, (int)(len - offset));
+if (asciiStream == null) {
-offset += read;
+throw new SQLException("Invalid Clob object. The call to getAsciiStream " +
-} while (read > 0);
+"returned null which cannot be serialized.");
+}
+}
+try (Reader reader = new BufferedReader(charStream)) {
+do {
+read = reader.read(buf, offset, (int)(len - offset));
+offset += read;
+} while (read > 0);
+}
 } catch (java.io.IOException ex) {
 throw new SerialException("SerialClob: " + ex.getMessage());
 }
 origLen = len;
 * @throws SQLException if there is an error accessing the
 *     <code>CLOB</code> value represented by the <code>Clob</code> object that was
 *     used to create this <code>SerialClob</code> object
 */
 public java.io.InputStream getAsciiStream() throws SerialException, SQLException {
 if (this.clob != null) {
 return this.clob.getAsciiStream();
 } else {
 throw new SerialException("Unsupported operation. SerialClob cannot " +
 "return a the CLOB value as an ascii stream, unless instantiated " +
 "with a fully implemented Clob object.");
 }
 }
 /**
 * Returns a copy of the substring contained in this
 * <code>SerialClob</code> object, starting at the given position

changeset 8405	bafd7b441d80
parent 5506	202f599c92aa
child 9035	1255eb81cc2f