Merge branch 'master' into JAVA-458

jyemin · jyemin · commit d4226865fdd0 · 2012-04-05T10:10:37.000-04:00
diff --git a/src/main/com/mongodb/gridfs/GridFSDBFile.java b/src/main/com/mongodb/gridfs/GridFSDBFile.java
@@ -64,7 +64,15 @@ public long writeTo( String filename ) throws IOException {
      * @throws IOException
      */
     public long writeTo( File f ) throws IOException {
-        return writeTo( new FileOutputStream( f ) );
+    	
+    	FileOutputStream out = null;
+    	try{
+    		out = new FileOutputStream( f );
+    		return writeTo( out);
+    	}finally{
+    	    if(out != null)
+    	        out.close();
+    	}
     }
 
     /**
@@ -74,12 +82,12 @@ public long writeTo( File f ) throws IOException {
      * @throws IOException
      */
     public long writeTo( OutputStream out )
-        throws IOException {
-        final int nc = numChunks();
-        for ( int i=0; i<nc; i++ ){
-            out.write( getChunk( i ) );
-        }
-        return _length;
+    		throws IOException {
+    	final int nc = numChunks();
+    	for ( int i=0; i<nc; i++ ){
+    	    out.write( getChunk( i ) );
+    	}
+    	return _length;
     }
     
     byte[] getChunk( int i ){
diff --git a/src/test/com/mongodb/SecondaryReadTest.java b/src/test/com/mongodb/SecondaryReadTest.java
@@ -64,9 +64,7 @@ public void testSecondaryReads1() throws Exception {
 
             for (int idx=0; idx < ITERATION_COUNT; idx++) {
                 for (ObjectId id : insertedIds) {
-                    final BasicDBObject doc = (BasicDBObject)col.findOne(new BasicDBObject("_id", id));
-                    if (doc == null) throw new IllegalStateException("Doc not found");
-                    if (!doc.getObjectId("_id").equals(id)) throw new IllegalStateException("Ids are off");
+                    col.findOne(new BasicDBObject("_id", id));
                 }
             }
 
@@ -102,9 +100,7 @@ public void testSecondaryReads2() throws Exception {
 
             for (int idx=0; idx < ITERATION_COUNT; idx++) {
                 for (ObjectId id : insertedIds) {
-                    final BasicDBObject doc = (BasicDBObject)col.findOne(new BasicDBObject("_id", id));
-                    if (doc == null) throw new IllegalStateException("Doc not found");
-                    if (!doc.getObjectId("_id").equals(id)) throw new IllegalStateException("Ids are off");
+                    col.findOne(new BasicDBObject("_id", id));
                 }
             }
 
@@ -140,9 +136,7 @@ public void testSecondaryReads3() throws Exception {
 
             for (int idx=0; idx < ITERATION_COUNT; idx++) {
                 for (ObjectId id : insertedIds) {
-                    final BasicDBObject doc = (BasicDBObject)col.findOne(new BasicDBObject("_id", id));
-                    if (doc == null) throw new IllegalStateException("Doc not found");
-                    if (!doc.getObjectId("_id").equals(id)) throw new IllegalStateException("Ids are off");
+                    col.findOne(new BasicDBObject("_id", id));
                 }
             }
 

Original file line number	Diff line number	Diff line change
`@@ -64,9 +64,7 @@ public void testSecondaryReads1() throws Exception {`
`64`	`64`
`65`	`65`	`for (int idx=0; idx < ITERATION_COUNT; idx++) {`
`66`	`66`	`for (ObjectId id : insertedIds) {`
`67`		`- final BasicDBObject doc = (BasicDBObject)col.findOne(new BasicDBObject("_id", id));`
`68`		`- if (doc == null) throw new IllegalStateException("Doc not found");`
`69`		`- if (!doc.getObjectId("_id").equals(id)) throw new IllegalStateException("Ids are off");`
	`67`	`+ col.findOne(new BasicDBObject("_id", id));`
`70`	`68`	`}`
`71`	`69`	`}`
`72`	`70`
`@@ -102,9 +100,7 @@ public void testSecondaryReads2() throws Exception {`
`102`	`100`
`103`	`101`	`for (int idx=0; idx < ITERATION_COUNT; idx++) {`
`104`	`102`	`for (ObjectId id : insertedIds) {`
`105`		`- final BasicDBObject doc = (BasicDBObject)col.findOne(new BasicDBObject("_id", id));`
`106`		`- if (doc == null) throw new IllegalStateException("Doc not found");`
`107`		`- if (!doc.getObjectId("_id").equals(id)) throw new IllegalStateException("Ids are off");`
	`103`	`+ col.findOne(new BasicDBObject("_id", id));`
`108`	`104`	`}`
`109`	`105`	`}`
`110`	`106`
`@@ -140,9 +136,7 @@ public void testSecondaryReads3() throws Exception {`
`140`	`136`
`141`	`137`	`for (int idx=0; idx < ITERATION_COUNT; idx++) {`
`142`	`138`	`for (ObjectId id : insertedIds) {`
`143`		`- final BasicDBObject doc = (BasicDBObject)col.findOne(new BasicDBObject("_id", id));`
`144`		`- if (doc == null) throw new IllegalStateException("Doc not found");`
`145`		`- if (!doc.getObjectId("_id").equals(id)) throw new IllegalStateException("Ids are off");`
	`139`	`+ col.findOne(new BasicDBObject("_id", id));`
`146`	`140`	`}`
`147`	`141`	`}`
`148`	`142`