8208060: Additional corrections of serial-related declarations

Reviewed-by: rriggs, lancea

src/java.base/share/classes/java/net/InetAddress.java

@@ -1709,8 +1709,7 @@ class InetAddress implements java.io.Serializable {
         return (InetAddressImpl) impl;
     }
 
-    private void readObjectNoData () throws
-                         IOException, ClassNotFoundException {
+    private void readObjectNoData () {
         if (getClass().getClassLoader() != null) {
             throw new SecurityException ("invalid address type");
         }

src/java.management/share/classes/java/lang/management/MemoryType.java

@@ -68,6 +68,4 @@ public enum MemoryType {
     public String toString() {
         return description;
     }
-
-    private static final long serialVersionUID = 6992337162326171013L;
 }

src/java.rmi/share/classes/java/rmi/activation/ActivationID.java

@@ -225,7 +225,7 @@ public class ActivationID implements Serializable {
      * specification.
      **/
     private void writeObject(ObjectOutputStream out)
-        throws IOException, ClassNotFoundException
+        throws IOException
     {
         out.writeObject(uid);
 

src/java.rmi/share/classes/java/rmi/server/RemoteObject.java

@@ -359,7 +359,7 @@ public abstract class RemoteObject implements Remote, java.io.Serializable {
      * <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");

src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialArray.java

@@ -629,7 +629,7 @@ public class SerialArray implements Array, Serializable, Cloneable {
      * to a stream.
      */
     private void writeObject(ObjectOutputStream s)
-            throws IOException, ClassNotFoundException {
+            throws IOException {
 
         ObjectOutputStream.PutField fields = s.putFields();
         fields.put("elements", elements);

src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialBlob.java

@@ -570,7 +570,7 @@ public class SerialBlob implements Blob, Serializable, Cloneable {
      * to a stream.
      */
     private void writeObject(ObjectOutputStream s)
-            throws IOException, ClassNotFoundException {
+            throws IOException {
 
         ObjectOutputStream.PutField fields = s.putFields();
         fields.put("buf", buf);

src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialRef.java

@@ -237,7 +237,7 @@ public class SerialRef implements Ref, Serializable, Cloneable {
      * to a stream.
      */
     private void writeObject(ObjectOutputStream s)
-            throws IOException, ClassNotFoundException {
+            throws IOException {
 
         ObjectOutputStream.PutField fields = s.putFields();
         fields.put("baseTypeName", baseTypeName);

src/java.sql.rowset/share/classes/javax/sql/rowset/serial/SerialStruct.java

@@ -332,7 +332,7 @@ public class SerialStruct implements Struct, Serializable, Cloneable {
      * to a stream.
      */
     private void writeObject(ObjectOutputStream s)
-            throws IOException, ClassNotFoundException {
+            throws IOException {
 
         ObjectOutputStream.PutField fields = s.putFields();
         fields.put("attribs", attribs);

src/java.sql/share/classes/java/sql/BatchUpdateException.java

@@ -553,7 +553,7 @@ public class BatchUpdateException extends SQLException {
      * to a stream.
      */
     private void writeObject(ObjectOutputStream s)
-            throws IOException, ClassNotFoundException {
+            throws IOException {
 
         ObjectOutputStream.PutField fields = s.putFields();
         fields.put("updateCounts", updateCounts);