allow stopping a TypedInputStream on EOF

src/main/java/de/tudbut/io/TypedInputStream.java

@@ -1,5 +1,6 @@
 package de.tudbut.io;
 
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -12,6 +13,7 @@ public class TypedInputStream {
     public int last = -1;
     private final Object waitForInputLock = new Object();
     private final Object readLock = new Object();
+    private boolean stopOnEOF = false;
 
     public InputStream getStream() {
         return stream;
@@ -23,6 +25,11 @@ public class TypedInputStream {
         this.stream = stream;
     }
 
+    public TypedInputStream stopOnEOF() {
+        stopOnEOF = true;
+        return this;
+    }
+    
     public byte readByte() throws IOException {
         return (byte) read();
     }
@@ -141,7 +148,9 @@ public class TypedInputStream {
         synchronized (waitForInputLock) {
             if(last != -1)
                 return;
-            while ((last = stream.read()) == -1) ;
+            while ((last = stream.read()) == -1 && !stopOnEOF) ;
+            if(last == -1)
+                throw new EOFException();
         }
     }
 
@@ -150,7 +159,9 @@ public class TypedInputStream {
             synchronized (waitForInputLock) {
                 int i;
                 if (last == -1) {
-                    while ((i = stream.read()) == -1) ;
+                    while ((i = stream.read()) == -1 && !stopOnEOF) ;
+                    if(i == -1)
+                        throw new EOFException();
                 }
                 else {
                     i = last;