From f84b6b1e26d5811a950dacdd7b271f192e640f58 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Tue, 18 Jun 2002 22:07:38 +0000 Subject: [PATCH] Behave appropriately in circumstances where we have no data left to return 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 --- src/java/com/threerings/presents/io/FramedInputStream.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/presents/io/FramedInputStream.java b/src/java/com/threerings/presents/io/FramedInputStream.java index e12e06c4a..5e95ae372 100644 --- a/src/java/com/threerings/presents/io/FramedInputStream.java +++ b/src/java/com/threerings/presents/io/FramedInputStream.java @@ -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; @@ -162,7 +162,9 @@ public class FramedInputStream extends InputStream // figure out how much data we'll return 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) { len = _count - _pos;