cleanup Mongo.Holder

Author: scotthernandez

src/main/com/mongodb/Mongo.java

@@ -18,12 +18,12 @@
 
 package com.mongodb;
 
-import java.net.*;
+import java.net.UnknownHostException;
 import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
-import org.bson.io.*;
+import org.bson.io.PoolOutputBuffer;
 
 /**
  * A database connection with internal pooling.
@@ -605,9 +605,11 @@ String _toKey( MongoURI uri ){
             buf.append( uri.getUsername() );
             return buf.toString();
         }
+        
+        public static Holder singleton() { return _default; }
 
-
-        private static final ConcurrentMap<String,Mongo> _mongos = new ConcurrentHashMap<String,Mongo>();
+        private static Holder _default = new Holder();
+        private final ConcurrentMap<String,Mongo> _mongos = new ConcurrentHashMap<String,Mongo>();
 
     }
 

src/test/com/mongodb/JavaClientTest.java

@@ -18,6 +18,7 @@
 package com.mongodb;
 
 import java.io.IOException;
+import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.regex.Pattern;
@@ -785,7 +786,14 @@ public void testAllTypes(){
         DBObject b = c.findOne();
         assertTrue(a.equals(b));
     }
+    
+    @Test
+    public void testMongoHolder() throws MongoException, UnknownHostException {
+        Mongo m1 = Mongo.Holder.singleton().connect( new MongoURI( "mongodb://localhost" ) );
+        Mongo m2 = Mongo.Holder.singleton().connect( new MongoURI( "mongodb://localhost" ) );
 
+        assertEquals( m1, m2);
+    }
     final Mongo _mongo;
     final DB _db;