diff a/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/RowSetMetaDataImpl.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -943,10 +943,15 @@
return interfaces.isInstance(this);
}
static final long serialVersionUID = 6893806403181801867L;
+ /**
+ * {@code ColInfo} objects are used to store information
+ * about each column in the {@code RowSet} object for which
+ * this {@code RowSetMetaDataImpl} object was created.
+ */
private class ColInfo implements Serializable {
/**
* The field that indicates whether the value in this column is a number
* that is incremented automatically, which makes the value read-only.
* true means that the value in this column
diff a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -606,10 +606,15 @@
}
/**
* readObject is called to restore the state of the {@code SerialArray} from
* a stream.
+ * @param s the {@code ObjectInputStream} to read from.
+ *
+ * @throws ClassNotFoundException if the class of a serialized object
+ * could not be found.
+ * @throws IOException if an I/O error occurs.
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields = s.readFields();
@@ -626,10 +631,12 @@
}
/**
* writeObject is called to save the state of the {@code SerialArray}
* to a stream.
+ * @param s the {@code ObjectOutputStream} to write to.
+ + @throws IOException if I/O errors occur.
*/
private void writeObject(ObjectOutputStream s)
throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
diff a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -548,10 +548,15 @@
}
/**
* readObject is called to restore the state of the SerialBlob from
* a stream.
+ * @param s the {@code ObjectInputStream} to read from.
+ *
+ * @throws ClassNotFoundException if the class of a serialized object
+ * could not be found.
+ * @throws IOException if an I/O error occurs.
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields = s.readFields();
@@ -567,10 +572,12 @@
}
/**
* writeObject is called to save the state of the SerialBlob
* to a stream.
+ * @param s the {@code ObjectOutputStream} to write to.
+ + @throws IOException if I/O errors occur.
*/
private void writeObject(ObjectOutputStream s)
throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
diff a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialClob.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -641,10 +641,15 @@
}
/**
* readObject is called to restore the state of the SerialClob from
* a stream.
+ * @param s the {@code ObjectInputStream} to read from.
+ *
+ * @throws ClassNotFoundException if the class of a serialized object
+ * could not be found.
+ * @throws IOException if an I/O error occurs.
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields = s.readFields();
@@ -660,10 +665,12 @@
}
/**
* writeObject is called to save the state of the SerialClob
* to a stream.
+ * @param s the {@code ObjectOutputStream} to write to.
+ + @throws IOException if I/O errors occur.
*/
private void writeObject(ObjectOutputStream s)
throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
diff a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialJavaObject.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -232,10 +232,15 @@
}
/**
* readObject is called to restore the state of the {@code SerialJavaObject}
* from a stream.
+ * @param s the {@code ObjectInputStream} to read from.
+ *
+ * @throws ClassNotFoundException if the class of a serialized object
+ * could not be found.
+ * @throws IOException if an I/O error occurs.
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields1 = s.readFields();
@@ -257,10 +262,12 @@
}
/**
* writeObject is called to save the state of the {@code SerialJavaObject}
* to a stream.
+ * @param s the {@code ObjectOutputStream} to write to.
+ + @throws IOException if I/O errors occur.
*/
private void writeObject(ObjectOutputStream s)
throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
fields.put("obj", obj);
diff a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -223,10 +223,15 @@
}
/**
* readObject is called to restore the state of the SerialRef from
* a stream.
+ * @param s the {@code ObjectInputStream} to read from.
+ *
+ * @throws ClassNotFoundException if the class of a serialized object
+ * could not be found.
+ * @throws IOException if an I/O error occurs.
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields = s.readFields();
object = fields.get("object", null);
@@ -235,10 +240,12 @@
}
/**
* writeObject is called to save the state of the SerialRef
* to a stream.
+ * @param s the {@code ObjectOutputStream} to write to.
+ + @throws IOException if I/O errors occur.
*/
private void writeObject(ObjectOutputStream s)
throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
diff a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -316,10 +316,15 @@
}
/**
* readObject is called to restore the state of the {@code SerialStruct} from
* a stream.
+ * @param s the {@code ObjectInputStream} to read from.
+ *
+ * @throws ClassNotFoundException if the class of a serialized object
+ * could not be found.
+ * @throws IOException if an I/O error occurs.
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields = s.readFields();
@@ -329,10 +334,12 @@
}
/**
* writeObject is called to save the state of the {@code SerialStruct}
* to a stream.
+ * @param s the {@code ObjectOutputStream} to write to.
+ + @throws IOException if I/O errors occur.
*/
private void writeObject(ObjectOutputStream s)
throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
diff a/src/java.sql/share/classes/java/sql/BatchUpdateException.java b/src/java.sql/share/classes/java/sql/BatchUpdateException.java
--- a/src/java.sql/share/classes/java/sql/BatchUpdateException.java
+++ b/src/java.sql/share/classes/java/sql/BatchUpdateException.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -526,10 +526,15 @@
return copy;
}
/**
* readObject is called to restore the state of the
* {@code BatchUpdateException} from a stream.
+ * @param s the {@code ObjectInputStream} to read from.
+ *
+ * @throws ClassNotFoundException if the class of a serialized object
+ * could not be found.
+ * @throws IOException if an I/O error occurs.
*/
private void readObject(ObjectInputStream s)
throws IOException, ClassNotFoundException {
ObjectInputStream.GetField fields = s.readFields();
@@ -549,10 +554,12 @@
}
/**
* writeObject is called to save the state of the {@code BatchUpdateException}
* to a stream.
+ * @param s the {@code ObjectOutputStream} to write to.
+ + @throws IOException if I/O errors occur.
*/
private void writeObject(ObjectOutputStream s)
throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
diff a/src/java.sql/share/classes/java/sql/SQLClientInfoException.java b/src/java.sql/share/classes/java/sql/SQLClientInfoException.java
--- a/src/java.sql/share/classes/java/sql/SQLClientInfoException.java
+++ b/src/java.sql/share/classes/java/sql/SQLClientInfoException.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2006, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -45,12 +45,13 @@
* @see Connection#setClientInfo
* @since 1.6
*/
public class SQLClientInfoException extends SQLException {
-
-
+ /**
+ * A {@code Map} containing the client info properties that could not be set.
+ */
@SuppressWarnings("serial") // Not statically typed as Serializable
private Map failedProperties;
/**
* Constructs a SQLClientInfoException Object.
diff a/src/java.sql/share/classes/javax/sql/StatementEvent.java b/src/java.sql/share/classes/javax/sql/StatementEvent.java
--- a/src/java.sql/share/classes/javax/sql/StatementEvent.java
+++ b/src/java.sql/share/classes/javax/sql/StatementEvent.java
@@ -1,7 +1,7 @@
/*
- * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2020, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation. Oracle designates this
@@ -41,11 +41,18 @@
* @since 1.6
*/
public class StatementEvent extends EventObject {
static final long serialVersionUID = -8089573731826608315L;
+ /**
+ * The {@code SQLException} the driver is about to throw to the application.
+ */
private SQLException exception;
+
+ /**
+ * The {@code PreparedStatement} that is being closed or is invalid.
+ */
@SuppressWarnings("serial") // Not statically typed as Serializable
private PreparedStatement statement;
/**
* Constructs a StatementEvent with the specified PooledConnection and