[JAVA-281]: when dropping a database or a collection, they remain in the driver cache, which can lead to problems

Author: agirbal

src/main/com/mongodb/DB.java

@@ -71,9 +71,6 @@ public DB( Mongo mongo , String name ){
      */
     public final DBCollection getCollection( String name ){
         DBCollection c = doGetCollection( name );
-        if ( c != null ){
-            _seenCollections.add( c );
-	}
         return c;
     }
 
@@ -327,15 +324,6 @@ public String toString(){
         return _name;
     }
 
-    /**
-     * Clears any indices that have not yet been applied to
-     * the collections in this database.
-     */
-    public void resetIndexCache(){
-        for ( DBCollection c : _seenCollections )
-            c.resetIndexCache();
-    }
-
     /**
      * Gets the the error (if there is one) from the previous operation on this connection.
      * The result of this command will look like
@@ -414,7 +402,7 @@ public void dropDatabase()
 
         CommandResult res = command(new BasicDBObject("dropDatabase", 1));
         res.throwOnError();
-
+        _mongo._dbs.remove(this.getName());
     }
 
     /**
@@ -670,7 +658,6 @@ public int getOptions(){
 
     final Mongo _mongo;
     final String _name;
-    final Set<DBCollection> _seenCollections = Collections.synchronizedSet( new HashSet<DBCollection>() );
 
     protected boolean _readOnly = false;
     private com.mongodb.WriteConcern _concern;

src/main/com/mongodb/DBApiLayer.java

@@ -170,7 +170,6 @@ void killCursors( ServerAddress addr , List<Long> all )
         _connector.say( this , om ,com.mongodb.WriteConcern.NONE , addr );
     }
 
-
     class MyCollection extends DBCollection {
         MyCollection( String name ){
             super( DBApiLayer.this , name );
@@ -180,6 +179,12 @@ class MyCollection extends DBCollection {
         public void doapply( DBObject o ){
         }
 
+        @Override
+        public void drop() throws MongoException {
+            super.drop();
+            _collections.remove(getName());
+        }
+
         public WriteResult insert(DBObject[] arr, com.mongodb.WriteConcern concern )
             throws MongoException {
             return insert( arr , true , concern );

src/main/com/mongodb/DBCollection.java

@@ -449,18 +449,18 @@ public final void ensureIndex( final DBObject keys , final DBObject optionsIN )
 
         final String name = options.get( "name" ).toString();
 
-        if ( _createIndexes.contains( name ) )
+        if ( _createdIndexes.contains( name ) )
             return;
 
         createIndex( keys , options );
-        _createIndexes.add( name );
+        _createdIndexes.add( name );
     }
 
     /**
      * Clears all indices that have not yet been applied to this collection.
      */
     public void resetIndexCache(){
-        _createIndexes.clear();
+        _createdIndexes.clear();
     }
 
     DBObject defaultOptions( DBObject keys ){
@@ -675,12 +675,8 @@ public void dropIndexes( String name )
             .get();
 
         CommandResult res = _db.command( cmd );
-        if ( res.ok() || res.getErrorMessage().equals( "ns not found" ) ){
-            resetIndexCache();
-            return;
-        }
-        
-        throw new MongoException( "error dropping indexes : " + res );
+        res.throwOnError();
+        resetIndexCache();
     }
 
     /**
@@ -689,11 +685,9 @@ public void dropIndexes( String name )
      */
     public void drop()
         throws MongoException {
-        resetIndexCache();
         CommandResult res =_db.command( BasicDBObjectBuilder.start().add( "drop" , getName() ).get() );
-        if ( res.ok() || res.getErrorMessage().equals( "ns not found" ) )
-            return;
-        throw new MongoException( "error dropping : " + res );
+        res.throwOnError();
+        resetIndexCache();
     }
 
     /**
@@ -1305,5 +1299,5 @@ public int getOptions(){
     private Map<String,Class> _internalClass = Collections.synchronizedMap( new HashMap<String,Class>() );
     private ReflectionDBObject.JavaWrapper _wrapper = null;
 
-    final private Set<String> _createIndexes = new HashSet<String>();
+    final private Set<String> _createdIndexes = new HashSet<String>();
 }