Wait for all storage responses when aborting.

Aborting might happen even before vote is called, wot there might be
pending store responses. Wait for them without doing conflict handling.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@1858 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/client/app.py

@@ -634,6 +634,8 @@ class Application(object):
             # dected as closed)
             while pending(queue):
                 _waitAnyMessage()
+            if tryToResolveConflict is None:
+                break
             conflicts = _handleConflicts(tryToResolveConflict)
             if conflicts:
                 update(conflicts)
@@ -642,6 +644,7 @@ class Application(object):
                 # requests
                 break
 
+        if tryToResolveConflict is not None:
             # Check for never-stored objects, and update result for all others
             for oid, store_count in \
                 local_var.object_stored_counter_dict.iteritems():
@@ -700,6 +703,10 @@ class Application(object):
         if transaction is not self.local_var.txn:
             return
 
+        # Just wait for response to arrive, don't handle any conflict, and
+        # ignore the outcome: we are going to abort anyway.
+        self.waitStoreResponses(None)
+
         cell_set = set()
         # select nodes where objects were stored
         for oid in self.local_var.data_dict.iterkeys():