1 files changed, 21 insertions, 0 deletions

diff --git a/src/unstable/cachebase.h b/src/unstable/cachebase.h
index 270c2df..6cc3e77 100644
--- a/src/unstable/cachebase.h
+++ b/src/unstable/cachebase.h
@@ -393,8 +393,27 @@ namespace Bu
                 return CachePtr<keytype, castto, obtype>( this, ptr.kId );
         }
 
+        /**
+         * Removes an item from the cache.
+         * This routine calls eraseNow for now.  Later the intention is that
+         * this function will always succeed.  It will remove the object from
+         * the backing store and the active tables.  It will not be able to
+         * be requested again, and all changes will be ignored.  When the
+         * object's last references are released the memory will be freed
+         * automatically.
+         */
         void erase( const keytype &key )
         {
+            eraseNow( key );
+        }
+
+        /**
+         * Removes an item from the cache and frees memory immediately.
+         * The object in question cannot have any active references in order
+         * for this to succeed, otherwise it will throw an exception.
+         */
+        void eraseNow( const keytype &key )
+        {
             Bu::ReadWriteMutex::WriteLocker wl( mCacheEntry );
             if( hCacheEntry.has( key ) )
             {
@@ -456,6 +475,8 @@ namespace Bu
             Entry *pEnt = new Entry( pObject );
             mCacheEntry.lockWrite();
             hCacheEntry.insert( pObject->getKey(), pEnt );
+            if( pObject->hasChanged() )
+                hChanged.insert( pObject->getKey(), true );
             mCacheEntry.unlockWrite();
             _create( pObject );
             pObject->setCache( this, pEnt );