[Neo-report] r2029 vincent - /trunk/neo/client/app.py

[nobody at svn.erp5.org]

Author: vincent
Date: Mon Apr 26 16:07:05 2010
New Revision: 2029

Log:
Simplify r1858.

There is no need to make a special case in waitStoreResponses if it becomes
equivalent to just calling waitResponses.

Modified:
    trunk/neo/client/app.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Mon Apr 26 16:07:05 2010
@@ -647,8 +647,6 @@
         _handleConflicts = self._handleConflicts
         while True:
             self.waitResponses()
-            if tryToResolveConflict is None:
-                break
             conflicts = _handleConflicts(tryToResolveConflict)
             if conflicts:
                 update(conflicts)
@@ -657,16 +655,15 @@
                 # 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():
-                if store_count == 0:
-                    raise NEOStorageError('tpc_store failed')
-                elif oid in resolved_oid_set:
-                    append((oid, ResolvedSerial))
-                else:
-                    append((oid, tid))
+        # Check for never-stored objects, and update result for all others
+        for oid, store_count in \
+            local_var.object_stored_counter_dict.iteritems():
+            if store_count == 0:
+                raise NEOStorageError('tpc_store failed')
+            elif oid in resolved_oid_set:
+                append((oid, ResolvedSerial))
+            else:
+                append((oid, tid))
         return result
 
     @profiler_decorator
@@ -720,7 +717,7 @@
 
         # Just wait for response to arrive, don't handle any conflict, and
         # ignore the outcome: we are going to abort anyway.
-        self.waitStoreResponses(None)
+        self.waitResponses()
 
         cell_set = set()
         # select nodes where objects were stored