Changeset 2653

Timestamp:

08/03/2010 21:21:22 (2 years ago)

Author:

chris

Message:

Merge [2645] into 0.11rc7.

File:

• box/RELEASE/0.11rc7/bin/bbstored/HousekeepStoreAccount.cpp (modified) (1 diff)

box/RELEASE/0.11rc7/bin/bbstored/HousekeepStoreAccount.cpp

@@ -880 +880 @@
         }
 
-        // Delete from disc
-        {
+        // Drop reference count by one. If it reaches zero, delete the file.
+        if(--mNewRefCounts[ObjectID] == 0)
+        {
+                BOX_TRACE("Removing unreferenced object " <<
+                        BOX_FORMAT_OBJECTID(ObjectID));
                 std::string objFilename;
                 MakeObjectFilename(ObjectID, objFilename);
                 RaidFileWrite del(mStoreDiscSet, objFilename);
                 del.Delete();
+        }
+        else
+        {
+                BOX_TRACE("Preserving object " <<
+                        BOX_FORMAT_OBJECTID(ObjectID) << " with " <<
+                        mNewRefCounts[ObjectID] << " references");
         }