This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
FYI: Patch: java.io
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Fri, 28 Mar 2003 10:52:25 +0100
- Subject: FYI: Patch: java.io
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi list,
I commited the attached obvious patch to trunk to fix the API of
java.io.ObjectOutputStream.PutField and java.io.FileDescriptor.
Michael
- --
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+hBtcWSOgCCdjSDsRAmrrAJ4w4bWQUUomM99JJ6/i9T4xl31F2QCfVGNh
VInczWlm00liJm4cAjCBk68=
=Zs5O
-----END PGP SIGNATURE-----
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.1818
diff -u -r1.1818 ChangeLog
--- ChangeLog 28 Mar 2003 08:59:40 -0000 1.1818
+++ ChangeLog 28 Mar 2003 09:48:08 -0000
@@ -1,3 +1,10 @@
+2003-03-28 Michael Koch <konqueror at gmx dot de>
+
+ * java/io/FileDescriptor.java
+ (finalize): Throws Throwable, not IOException.
+ * java/io/ObjectOutputStream.java
+ (PutField.put): Doesnt throws anything.
+
200303-28 Michael Koch <konqueror at gmx dot de>
* java/io/FileOutputStream.java:
Index: java/io/FileDescriptor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/FileDescriptor.java,v
retrieving revision 1.11
diff -u -r1.11 FileDescriptor.java
--- java/io/FileDescriptor.java 4 Jan 2003 03:53:00 -0000 1.11
+++ java/io/FileDescriptor.java 28 Mar 2003 09:48:10 -0000
@@ -79,7 +79,7 @@
// When collected, close.
- protected void finalize () throws IOException
+ protected void finalize () throws Throwable
{
if (valid ())
close ();
Index: java/io/ObjectOutputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/ObjectOutputStream.java,v
retrieving revision 1.14
diff -u -r1.14 ObjectOutputStream.java
--- java/io/ObjectOutputStream.java 24 Mar 2003 08:27:28 -0000 1.14
+++ java/io/ObjectOutputStream.java 28 Mar 2003 09:48:11 -0000
@@ -841,24 +841,19 @@
*/
public static abstract class PutField
{
- public abstract void put (String name, boolean value)
- throws IOException, IllegalArgumentException;
- public abstract void put (String name, byte value)
- throws IOException, IllegalArgumentException;
- public abstract void put (String name, char value)
- throws IOException, IllegalArgumentException;
- public abstract void put (String name, double value)
- throws IOException, IllegalArgumentException;
- public abstract void put (String name, float value)
- throws IOException, IllegalArgumentException;
- public abstract void put (String name, int value)
- throws IOException, IllegalArgumentException;
- public abstract void put (String name, long value)
- throws IOException, IllegalArgumentException;
- public abstract void put (String name, short value)
- throws IOException, IllegalArgumentException;
- public abstract void put (String name, Object value)
- throws IOException, IllegalArgumentException;
+ public abstract void put (String name, boolean value);
+ public abstract void put (String name, byte value);
+ public abstract void put (String name, char value);
+ public abstract void put (String name, double value);
+ public abstract void put (String name, float value);
+ public abstract void put (String name, int value);
+ public abstract void put (String name, long value);
+ public abstract void put (String name, short value);
+ public abstract void put (String name, Object value);
+
+ /**
+ * @deprecated
+ */
public abstract void write (ObjectOutput out) throws IOException;
}
@@ -874,7 +869,6 @@
= new Object[currentObjectStreamClass.objectFieldCount];
public void put (String name, boolean value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@@ -883,7 +877,6 @@
}
public void put (String name, byte value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@@ -892,7 +885,6 @@
}
public void put (String name, char value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@@ -903,7 +895,6 @@
}
public void put (String name, double value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@@ -921,7 +912,6 @@
}
public void put (String name, float value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@@ -935,7 +925,6 @@
}
public void put (String name, int value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@@ -948,7 +937,6 @@
}
public void put (String name, long value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@@ -965,7 +953,6 @@
}
public void put (String name, short value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@@ -976,7 +963,6 @@
}
public void put (String name, Object value)
- throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);