handle dropped connections better JAVA-140

mongodb · Jul 29, 2010 · 57c73bf · 57c73bf
1 parent 3a4449e
commit 57c73bf
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/src/main/com/mongodb/DBPortPool.java b/src/main/com/mongodb/DBPortPool.java
@@ -166,7 +166,22 @@ void gotError( Exception e ){
             return;
         }
         Bytes.LOGGER.log( Level.INFO , "emptying DBPortPool b/c of error" , e );
-        clear();
+
+        // force close all sockets 
+
+        List<DBPort> all = new ArrayList<DBPort>();
+        while ( true ){
+            DBPort temp = get(0);
+            if ( temp == null )
+                break;
+            all.add( temp );
+        }
+
+        for ( DBPort p : all ){
+            p.close();
+            done(p);
+        }
+
     }
 
     void close(){

diff --git a/src/main/com/mongodb/DBTCPConnector.java b/src/main/com/mongodb/DBTCPConnector.java
@@ -285,11 +285,17 @@ void done( DBPort p ){
         }
 
         void error( Exception e ){
-            _curPortPool.remove( _port );
+            if ( _last == null )
+                throw new IllegalStateException( "this should be impossible" );
+
             _curPortPool.gotError( e );
 
-            _internalStack = 0;
+            _curPortPool.done( _last );
+            _last.close();
+
             _last = null;
+            _port = null;
+            _internalStack = 0;
         }
 
         void requestEnsureConnection(){