AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Behave appropriately in circumstances where we have no data left to return

Browse Source 
but the caller asks for zero bytes. In such cases we are to return zero
rather than -1 (which would indicate EOF).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1473 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-06-18 22:07:38 +00:00
parent f91f47d73b
commit f84b6b1e26
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/io/FramedInputStream.java
+4 -2
View File
@@ -1,5 +1,5 @@
// //
// $Id: FramedInputStream.java,v 1.9 2001/10/24 00:35:37 mdb Exp $ // $Id: FramedInputStream.java,v 1.10 2002/06/18 22:07:38 mdb Exp $
package com.threerings.presents.io; package com.threerings.presents.io;
@@ -162,7 +162,9 @@ public class FramedInputStream extends InputStream
// figure out how much data we'll return // figure out how much data we'll return
if (_pos >= _count) { if (_pos >= _count) {
return -1; // if they asked to read zero bytes and we have no bytes
// remaining; we're supposed to return 0 rather than EOF
return (len == 0) ? 0 : -1;
} }
if (_pos + len > _count) { if (_pos + len > _count) {
len = _count - _pos; len = _count - _pos;