1 files changed, 30 insertions, 23 deletions

diff --git a/src/unstable/cachebase.h b/src/unstable/cachebase.h
index 1f78360..5da4ce9 100644
--- a/src/unstable/cachebase.h
+++ b/src/unstable/cachebase.h
@@ -518,8 +518,10 @@ namespace Bu
 
         void sync()
         {
-            Bu::ReadWriteMutex::WriteLocker wl( mCacheEntry );
-            _sync();
+            {
+                Bu::ReadWriteMutex::WriteLocker wl( mCacheEntry );
+                _sync();
+            }
             syncChanges();
         }
 
@@ -601,30 +603,35 @@ namespace Bu
 
         void syncChanges()
         {
-            if( !hChanged.isEmpty() )
+            Bu::List<keytype> lKeys;
+            mCacheEntry.lockWrite();
+            for( typename CacheKeySet::iterator i = hChanged.begin(); i; i++ )
             {
-                for( typename CacheKeySet::iterator i = hChanged.begin(); i; i++ )
+                lKeys.append( i.getKey() );
+            }
+            hChanged.clear();
+            mCacheEntry.unlockWrite();
+
+            for( typename List<keytype>::iterator i = lKeys.begin(); i; i++ )
+            {
+                Entry *pEnt = NULL;
+                try
+                {
+                    pEnt = hCacheEntry.get( *i );
+                }
+                catch( Bu::HashException )
+                {
+                    // The entry wasn't there, most likely because it
+                    // was deleted.  That's ok.
+                }
+                // This isn't inside of the above because we want to be
+                // able to handle these exceptions differently.
+                if( pEnt )
                 {
-                    Entry *pEnt = NULL;
-                    try
-                    {
-                        pEnt = hCacheEntry.get( i.getKey() );
-                    }
-                    catch( Bu::HashException )
-                    {
-                        // The entry wasn't there, most likely because it
-                        // was deleted.  That's ok.
-                    }
-                    // This isn't inside of the above because we want to be
-                    // able to handle these exceptions differently.
-                    if( pEnt )
-                    {
-                        Bu::MutexLocker ml( pEnt->getMutex() );
-                        _save( pEnt->getPtr() );
-                        pEnt->getPtr()->changed( false );
-                    }
+                    Bu::MutexLocker ml( pEnt->getMutex() );
+                    _save( pEnt->getPtr() );
+                    pEnt->getPtr()->changed( false );
                 }
-                hChanged.clear();
             }
         }