few minor improvements

erh · erh · commit 43eeba742e62 · 2010-10-22T09:14:33.000-04:00
diff --git a/src/main/org/bson/BSONDecoder.java b/src/main/org/bson/BSONDecoder.java
@@ -259,13 +259,13 @@ class Input {
         int readInt()
             throws IOException {
             _read += 4;
-            return Bits.readInt( _in );
+            return Bits.readInt( _in , _random );
         }
 
         long readLong()
             throws IOException {
             _read += 8;
-            return Bits.readLong( _in );
+            return Bits.readLong( _in , _random );
         }
 
         double readDouble()
diff --git a/src/main/org/bson/io/Bits.java b/src/main/org/bson/io/Bits.java
@@ -24,10 +24,15 @@
 public class Bits {
 
     public static void readFully( InputStream in, byte[] b )
+        throws IOException {
+        readFully( in , b , b.length );
+    }
+
+    public static void readFully( InputStream in, byte[] b , int l )
         throws IOException {
         int x = 0;
-        while ( x<b.length ){
-            int temp = in.read( b , x , b.length - x );
+        while ( x<l ){
+            int temp = in.read( b , x , l - x );
             if ( temp < 0 )
                 throw new EOFException();
             x += temp;
@@ -36,8 +41,12 @@ public static void readFully( InputStream in, byte[] b )
 
     public static int readInt( InputStream in )
         throws IOException {
-        byte[] data = new byte[4];
-        readFully(in, data);
+        return readInt( in , new byte[4] );
+    }
+
+    public static int readInt( InputStream in , byte[] data )
+        throws IOException {
+        readFully(in, data, 4);
         return readInt(data);
     }
 
@@ -52,9 +61,13 @@ public static int readInt( byte[] data ) {
 
     public static long readLong( InputStream in )
         throws IOException {
+        return readLong( in , new byte[8] );
+    }
 
-        byte[] data = new byte[8];
-        readFully(in, data);
+
+    public static long readLong( InputStream in , byte[] data )
+        throws IOException {
+        readFully(in, data, 8);
         return readLong(data);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -259,13 +259,13 @@ class Input {`
`259`	`259`	`int readInt()`
`260`	`260`	`throws IOException {`
`261`	`261`	`_read += 4;`
`262`		`- return Bits.readInt( _in );`
	`262`	`+ return Bits.readInt( _in , _random );`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`long readLong()`
`266`	`266`	`throws IOException {`
`267`	`267`	`_read += 8;`
`268`		`- return Bits.readLong( _in );`
	`268`	`+ return Bits.readLong( _in , _random );`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`double readDouble()`