[GNUnet-SVN] r20749 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2012-03-24 19:53:22 +0100 (Sat, 24 Mar 2012)
New Revision: 20749

Modified:
   gnunet/src/fs/fs_publish.c
   gnunet/src/fs/fs_tree.c
Log:
-fix error handling during publishing


Modified: gnunet/src/fs/fs_publish.c
===================================================================
--- gnunet/src/fs/fs_publish.c  2012-03-24 18:45:44 UTC (rev 20748)
+++ gnunet/src/fs/fs_publish.c  2012-03-24 18:53:22 UTC (rev 20749)
@@ -388,7 +388,6 @@
   p = pc->fi_pos;
   GNUNET_FS_tree_encoder_finish (p->te, &p->chk_uri, &emsg);
   p->te = NULL;
-  GNUNET_FS_file_information_sync_ (p);
   if (NULL != emsg)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Error during tree walk: %s\n", emsg);
@@ -399,6 +398,7 @@
     pi.value.publish.specifics.error.message = p->emsg;
     p->client_info = GNUNET_FS_publish_make_status_ (&pi, pc, p, 0);
   }
+  GNUNET_FS_file_information_sync_ (p);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Finished with tree encoder\n");
   /* final progress event */
   flen = GNUNET_FS_uri_chk_get_file_size (p->chk_uri);

Modified: gnunet/src/fs/fs_tree.c
===================================================================
--- gnunet/src/fs/fs_tree.c     2012-03-24 18:45:44 UTC (rev 20748)
+++ gnunet/src/fs/fs_tree.c     2012-03-24 18:53:22 UTC (rev 20749)
@@ -361,8 +361,8 @@
     if (pt_size !=
         te->reader (te->cls, te->publish_offset, pt_size, iob, &te->emsg))
     {
+      te->in_next = GNUNET_NO;
       te->cont (te->cls, NULL);
-      te->in_next = GNUNET_NO;
       return;
     }
     pt_block = iob;