1 files changed, 3 insertions, 4 deletions
diff --git a/lib/java/src/main/java/org/apache/thrift/transport/TFileTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TFileTransport.java
index 713d52103..b06727249 100644
--- a/lib/java/src/main/java/org/apache/thrift/transport/TFileTransport.java
+++ b/lib/java/src/main/java/org/apache/thrift/transport/TFileTransport.java
@@ -447,12 +447,11 @@ public class TFileTransport extends TTransport {
     if (!isOpen())
       throw new TTransportException(TTransportException.NOT_OPEN, "Must open before reading");
 
-    if (currentEvent_.getRemaining() == 0) {
-      if (!readEvent()) return (0);
+    if (currentEvent_.getRemaining() == 0 && !readEvent()) {
+      return 0;
     }
 
-    int nread = currentEvent_.emit(buf, off, len);
-    return nread;
+    return currentEvent_.emit(buf, off, len);
   }
 
   public int getNumChunks() throws TTransportException {