Fixed some memory cleanup and destruction issues with ContextObj, ECData, CDList, and CDMap. Added the d_underTheShotgun field to NodeManager to keep track of which NodeValue is currently being deleted. If a Node or TNode has this node value, it can always be deleted. This avoids the need for introducing SoftNodes. Currently passes Debug and Production make check

1 files changed, 5 insertions, 5 deletions

diff --git a/src/context/cdmap.h b/src/context/cdmap.h
index 460f917ff..1dc44d087 100644
--- a/src/context/cdmap.h
+++ b/src/context/cdmap.h
@@ -201,13 +201,13 @@ public:
 
   ~CDMap() throw(AssertionException) {
     // Delete all the elements and clear the map
-    for(typename table_type::iterator
-	  i = d_map.begin(), iend = d_map.end(); i != iend; ++i) {
-      /*
+    /*for(typename table_type::iterator
+          i = d_map.begin(), iend = d_map.end(); i != iend; ++i) {
+
         delete (*i).second;
         free((*i).second);
-      */
-    }
+
+    }*/
     d_map.clear();
     emptyTrash();
   }