better handling of Mongo.close

Author: erh

src/main/com/mongodb/DBTCPConnector.java

@@ -112,6 +112,11 @@ public void requestEnsureConnection(){
         _myPort.get().requestEnsureConnection();
     }
 
+    void _checkClosed(){
+        if ( _closed )
+            throw new IllegalStateException( "this Mongo has been closed" );
+    }
+
     WriteResult _checkWriteError( DB db , MyPort mp , DBPort port , WriteConcern concern )
         throws MongoException {
 
@@ -135,6 +140,9 @@ WriteResult _checkWriteError( DB db , MyPort mp , DBPort port , WriteConcern con
 
     public WriteResult say( DB db , OutMessage m , WriteConcern concern )
         throws MongoException {
+
+        _checkClosed();
+
         MyPort mp = _myPort.get();
         DBPort port = mp.get( true , false );
         port.checkAuth( db );
@@ -181,6 +189,8 @@ public Response call( DB db , DBCollection coll , OutMessage m )
     public Response call( DB db , DBCollection coll , OutMessage m , int retries )
         throws MongoException {
 
+        _checkClosed();
+
         final MyPort mp = _myPort.get();
         final DBPort port = mp.get( false , m.hasOption( Bytes.QUERYOPTION_SLAVEOK ) );
 
@@ -337,6 +347,7 @@ public String debugString(){
     }
 
     public void close(){
+        _closed = true;
         _portHolder.close();
         _rsStatus.close();
     }
@@ -347,6 +358,7 @@ public void close(){
     private DBPortPool.Holder _portHolder;
     private final List<ServerAddress> _allHosts;
     private final ReplicaSetStatus _rsStatus;
+    private boolean _closed = false;
 
     private final ThreadLocal<MyPort> _myPort = new ThreadLocal<MyPort>(){
         protected MyPort initialValue(){

src/main/com/mongodb/Mongo.java

@@ -291,7 +291,7 @@ public List<ServerAddress> getAllAddress() {
 
     /**
      * closes all open connections
-     * this Mongo instance can be re-used however
+     * this Mongo cannot be re-used
      */
     public void close(){
         _connector.close();

src/main/com/mongodb/ReplicaSetStatus.java

@@ -38,6 +38,11 @@ boolean ready(){
         return _setName != null;
     }
 
+    void _checkClosed(){
+        if ( _closed )
+            throw new IllegalStateException( "ReplicaSetStatus closed" );
+    }
+
     /**
      * @return master or null if don't have one
      */
@@ -49,6 +54,7 @@ ServerAddress getMaster(){
     }
 
     Node getMasterNode(){
+        _checkClosed();
         for ( int i=0; i<_all.size(); i++ ){
             Node n = _all.get(i);
             if ( n.master() )
@@ -62,6 +68,7 @@ Node getMasterNode(){
      * @return a good secondary or null if can't find one
      */
     ServerAddress getASecondary(){
+        _checkClosed();
         Node best = null;
 
         int start = _random.nextInt( _all.size() );
@@ -199,7 +206,7 @@ class Updater extends Thread {
         }
 
         public void run(){
-            while ( true ){
+            while ( ! _closed ){
                 try {
                     updateAll();
                 }
@@ -286,7 +293,7 @@ void printStatus(){
     }
 
     void close(){
-        // TODO
+        _closed = false;
     }
 
     final Mongo _mongo;
@@ -298,7 +305,8 @@ void close(){
     Logger _logger = _rootLogger; // will get changed to use set name once its found
 
     String _lastPrimarySignal;
-
+    boolean _closed = false;
+    
     final Random _random = new Random();
 
     static final MongoOptions _mongoOptions = new MongoOptions();