Merge branch 'neopaf-issue87'

Fix premature EOF in UnsafeByteArrayInputStream

Fixes #87
Fixes 88

Author: michel-kraemer

src/main/java/de/undercouch/bson4jackson/io/UnsafeByteArrayInputStream.java

@@ -51,7 +51,7 @@ public UnsafeByteArrayInputStream(byte[] buf, int off, int len) {
 
     @Override
     public int read() {
-        return _pos >= _count ? -1 : _buf[_pos++];
+        return _pos >= _count ? -1 : (_buf[_pos++] & 0xFF);
     }
 
     @Override

src/test/java/de/undercouch/bson4jackson/io/UnsafeByteArrayInputStreamTest.java

@@ -13,8 +13,9 @@
  * @author Michel Kraemer
  */
 public class UnsafeByteArrayInputStreamTest {
-    private static final byte[] BUF = "abcdefghijklmnopqrstuvwxyz\0\0".getBytes();
+    private static final byte[] BUF = "aXcdefghijklmnopqrstuvwxyz\0\0".getBytes();
     static {
+        BUF[1] = (byte)0xff;
         BUF[BUF.length - 1] = (byte)0xff;
     }
     private UnsafeByteArrayInputStream _in;
@@ -36,7 +37,7 @@ public void available() {
     @Test
     public void read() {
         assertEquals('a', _in.read());
-        assertEquals('b', _in.read());
+        assertEquals(0xFF, _in.read());
         assertEquals('c', _in.read());
 
         byte[] b = new byte[10];
@@ -88,7 +89,7 @@ public void offset() {
     @Test
     public void mark() {
         assertEquals('a', _in.read());
-        assertEquals('b', _in.read());
+        assertEquals(0xFF, _in.read());
         assertEquals('c', _in.read());
         _in.mark(3);
         assertEquals('d', _in.read());