Author: dreiss
Date: Tue Mar 9 05:19:14 2010
New Revision: 920659
URL: http://svn.apache.org/viewvc?rev=920659&view=rev
Log:
THRIFT-661. java: Detect EOF in TIOStreamTransport
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
Modified:
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java?rev=920659&r1=920658&r2=920659&view=diff
==============================================================================
---
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
(original)
+++
incubator/thrift/trunk/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
Tue Mar 9 05:19:14 2010
@@ -122,11 +122,16 @@ public class TIOStreamTransport extends
if (inputStream_ == null) {
throw new TTransportException(TTransportException.NOT_OPEN, "Cannot read
from null inputStream");
}
+ int bytesRead;
try {
- return inputStream_.read(buf, off, len);
+ bytesRead = inputStream_.read(buf, off, len);
} catch (IOException iox) {
throw new TTransportException(TTransportException.UNKNOWN, iox);
}
+ if (bytesRead < 0) {
+ throw new TTransportException(TTransportException.END_OF_FILE);
+ }
+ return bytesRead;
}
/**
