fix concurrency issue cleaning up pooled scopes

2009-08-21 16:15:36 -04:00
parent 33ac3c31c3
commit 1e1977a698
1 changed files with 9 additions and 3 deletions
--- a/scripting/engine.cpp
+++ b/scripting/engine.cpp
@@ -124,9 +124,15 @@ namespace mongo {
        PooledScope( const string pool , Scope * real ) : _pool( pool ) , _real( real ){};
        virtual ~PooledScope(){
            ScopeCache * sc = scopeCache.get();
-            assert( sc );
-            sc->done( _pool , _real );
-            _real = 0;
+            if ( sc ){
+                sc->done( _pool , _real );
+                _real = 0;
+            }
+            else {
+                log() << "warning: scopeCache is empty!" << endl;
+                delete _real;
+                _real = 0;
+            }
        }
        
        void reset(){