[GNUnet-SVN] r6306 - GNUnet/src/applications/fs/gap

[gnunet]

Author: grothoff
Date: 2008-02-15 10:42:17 -0700 (Fri, 15 Feb 2008)
New Revision: 6306

Modified:
   GNUnet/src/applications/fs/gap/migration.c
Log:
mig

Modified: GNUnet/src/applications/fs/gap/migration.c
===================================================================
--- GNUnet/src/applications/fs/gap/migration.c  2008-02-15 17:02:40 UTC (rev 
6305)
+++ GNUnet/src/applications/fs/gap/migration.c  2008-02-15 17:42:17 UTC (rev 
6306)
@@ -255,9 +255,17 @@
                  "Migration: random lookup in datastore returned type %d.\n",
                  ntohl (value->type));
 #endif
-  if ((ntohl (value->type) == GNUNET_ECRS_BLOCKTYPE_ONDEMAND) ||
-      (ntohl (value->type) == GNUNET_ECRS_BLOCKTYPE_ONDEMAND_OLD))
+  if (ntohl (value->type) == GNUNET_ECRS_BLOCKTYPE_ONDEMAND_OLD)
     {
+      datastore->del(&content[entry].key,
+                    value);
+      GNUNET_free_non_null (value);
+      content[entry].value = NULL;
+      GNUNET_mutex_unlock (GNUNET_FS_lock);
+      return 0;
+    }
+  if (ntohl (value->type) == GNUNET_ECRS_BLOCKTYPE_ONDEMAND)    
+    {
       if (GNUNET_FS_ONDEMAND_get_indexed_content
           (value, &content[entry].key, &enc) != GNUNET_OK)
         {