procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ObjectInputStream.java (read): AND byte with 0xff to make result unsigned.

Browse source 
* java/io/ObjectInputStream.java (read): AND byte with 0xff to make
	result unsigned.
	(read (byte[], int, int)): Only call readNextBlock() if the block
	buffer would actually be overrun. Increment blockDataPosition.
	(callReadMethod): Propagate exceptions from invocation target.
	* java/io/ObjectOutputStream.java (callWriteMethod): Propagate
	exceptions from invocation target.

From-SVN: r39293
This commit is contained in:
Bryce McKinlay 2001-01-27 06:04:29 +00:00 • committed by Bryce McKinlay
parent 31e1e0a652
commit 60b7365f52
3 changed files with 53 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

29
libjava/java/io/ObjectInputStream.java
View file

@ -577,21 +577,23 @@ public class ObjectInputStream extends InputStream
{
if (this.blockDataPosition >= this.blockDataBytes)
readNextBlock ();
return this.blockData[this.blockDataPosition++];
return (this.blockData[this.blockDataPosition++] & 0xff);
}
else
return this.realInputStream.read ();
}
public int read (byte data[], int offset, int length) throws IOException
public int read (byte[] data, int offset, int length) throws IOException
{
if (this.readDataFromBlock)
{
if (this.blockDataPosition + length >= this.blockDataBytes)
if (this.blockDataPosition + length > this.blockDataBytes)
readNextBlock ();
System.arraycopy (this.blockData, this.blockDataPosition,
data, offset, length);
blockDataPosition += length;
return length;
}
else
@ -1359,16 +1361,29 @@ public class ObjectInputStream extends InputStream
{
try
{
Class classArgs[] = {Class.forName ("java.io.ObjectInputStream")};
Class classArgs[] = {ObjectInputStream.class};
Method m = getMethod (klass, "readObject", classArgs);
if (m == null)
return;
Object args[] = {this};
m.invoke (obj, args);
m.invoke (obj, args);
}
catch (Exception _)
catch (InvocationTargetException x)
{
throw new IOException ();
/* Rethrow if possible. */
Throwable exception = x.getTargetException();
if (exception instanceof RuntimeException)
throw (RuntimeException) exception;
if (exception instanceof IOException)
throw (IOException) exception;
throw new IOException ("Exception thrown from readObject() on " +
klass + ": " + exception.getClass().getName());
}
catch (Exception x)
{
throw new IOException ("Failure invoking readObject() on " +
klass + ": " + x.getClass().getName());
}
}