8208060: Additional corrections of serial-related declarations
Reviewed-by: rriggs, lancea
--- a/src/java.base/share/classes/java/net/InetAddress.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.base/share/classes/java/net/InetAddress.java Fri Jul 20 14:46:43 2018 -0700
@@ -1709,8 +1709,7 @@
return (InetAddressImpl) impl;
}
- private void readObjectNoData () throws
- IOException, ClassNotFoundException {
+ private void readObjectNoData () {
if (getClass().getClassLoader() != null) {
throw new SecurityException ("invalid address type");
}
--- a/src/java.management/share/classes/java/lang/management/MemoryType.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.management/share/classes/java/lang/management/MemoryType.java Fri Jul 20 14:46:43 2018 -0700
@@ -68,6 +68,4 @@
public String toString() {
return description;
}
-
- private static final long serialVersionUID = 6992337162326171013L;
}
--- a/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.rmi/share/classes/java/rmi/activation/ActivationID.java Fri Jul 20 14:46:43 2018 -0700
@@ -225,7 +225,7 @@
* specification.
**/
private void writeObject(ObjectOutputStream out)
- throws IOException, ClassNotFoundException
+ throws IOException
{
out.writeObject(uid);
--- a/src/java.rmi/share/classes/java/rmi/server/RemoteObject.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.rmi/share/classes/java/rmi/server/RemoteObject.java Fri Jul 20 14:46:43 2018 -0700
@@ -359,7 +359,7 @@
* <code>readExternal</code> method.
*/
private void writeObject(java.io.ObjectOutputStream out)
- throws java.io.IOException, java.lang.ClassNotFoundException
+ throws java.io.IOException
{
if (ref == null) {
throw new java.rmi.MarshalException("Invalid remote object");
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java Fri Jul 20 14:46:43 2018 -0700
@@ -629,7 +629,7 @@
* to a stream.
*/
private void writeObject(ObjectOutputStream s)
- throws IOException, ClassNotFoundException {
+ throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
fields.put("elements", elements);
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java Fri Jul 20 14:46:43 2018 -0700
@@ -570,7 +570,7 @@
* to a stream.
*/
private void writeObject(ObjectOutputStream s)
- throws IOException, ClassNotFoundException {
+ throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
fields.put("buf", buf);
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java Fri Jul 20 14:46:43 2018 -0700
@@ -237,7 +237,7 @@
* to a stream.
*/
private void writeObject(ObjectOutputStream s)
- throws IOException, ClassNotFoundException {
+ throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
fields.put("baseTypeName", baseTypeName);
--- a/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java Fri Jul 20 14:46:43 2018 -0700
@@ -332,7 +332,7 @@
* to a stream.
*/
private void writeObject(ObjectOutputStream s)
- throws IOException, ClassNotFoundException {
+ throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
fields.put("attribs", attribs);
--- a/src/java.sql/share/classes/java/sql/BatchUpdateException.java Fri Jul 20 12:19:28 2018 -0700
+++ b/src/java.sql/share/classes/java/sql/BatchUpdateException.java Fri Jul 20 14:46:43 2018 -0700
@@ -553,7 +553,7 @@
* to a stream.
*/
private void writeObject(ObjectOutputStream s)
- throws IOException, ClassNotFoundException {
+ throws IOException {
ObjectOutputStream.PutField fields = s.putFields();
fields.put("updateCounts", updateCounts);