Jelajahi Sumber

Merge pull request #2155 from jonasmalacofilho/development

[java] Catch end of file on stdin
Cauê Waneck 12 tahun lalu
induk
melakukan
b4b7124dfb
1 mengubah file dengan 5 tambahan dan 5 penghapusan
  1. 5 5
      std/java/io/NativeInput.hx

+ 5 - 5
std/java/io/NativeInput.hx

@@ -37,17 +37,17 @@ import java.io.EOFException;
 
 	override public function readByte():Int
 	{
+		var ret = 0;
 		try
 		{
-			return stream.read();
-		}
-		catch (e:EOFException) {
-			throw new Eof();
+			ret = stream.read();
 		}
-
 		catch (e:IOException) {
 			throw haxe.io.Error.Custom(e);
 		}
+		if ( ret == -1 )
+			throw new Eof();
+		return ret;
 	}
 
 	override public function readBytes(s:Bytes, pos:Int, len:Int):Int