2003-03-28 Michael Koch <konqueror@gmx.de>

* java/io/FileDescriptor.java
	(finalize): Throws Throwable, not IOException.
	* java/io/ObjectOutputStream.java
	(PutField.put): Doesnt throws anything.

From-SVN: r64970
This commit is contained in:
Michael Koch 2003-03-28 09:49:44 +00:00 committed by Michael Koch
parent 0c85dbfd12
commit bcfaead06e
3 changed files with 21 additions and 28 deletions

View File

@ -1,3 +1,10 @@
2003-03-28 Michael Koch <konqueror@gmx.de>
* java/io/FileDescriptor.java
(finalize): Throws Throwable, not IOException.
* java/io/ObjectOutputStream.java
(PutField.put): Doesnt throws anything.
2003­03-28 Michael Koch <konqueror@gmx.de>
* java/io/FileOutputStream.java:

View File

@ -79,7 +79,7 @@ public final class FileDescriptor
// When collected, close.
protected void finalize () throws IOException
protected void finalize () throws Throwable
{
if (valid ())
close ();

View File

@ -841,24 +841,19 @@ public class ObjectOutputStream extends OutputStream
*/
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 @@ public class ObjectOutputStream extends OutputStream
= new Object[currentObjectStreamClass.objectFieldCount];
public void put (String name, boolean value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@ -883,7 +877,6 @@ public class ObjectOutputStream extends OutputStream
}
public void put (String name, byte value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@ -892,7 +885,6 @@ public class ObjectOutputStream extends OutputStream
}
public void put (String name, char value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@ -903,7 +895,6 @@ public class ObjectOutputStream extends OutputStream
}
public void put (String name, double value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@ -921,7 +912,6 @@ public class ObjectOutputStream extends OutputStream
}
public void put (String name, float value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@ -935,7 +925,6 @@ public class ObjectOutputStream extends OutputStream
}
public void put (String name, int value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@ -948,7 +937,6 @@ public class ObjectOutputStream extends OutputStream
}
public void put (String name, long value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@ -965,7 +953,6 @@ public class ObjectOutputStream extends OutputStream
}
public void put (String name, short value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);
@ -976,7 +963,6 @@ public class ObjectOutputStream extends OutputStream
}
public void put (String name, Object value)
throws IOException, IllegalArgumentException
{
ObjectStreamField field
= currentObjectStreamClass.getField (name);