Merge remote branch 'origin/stuck-continuous-replications' into 1.6.x

cloudant · Oct 18, 2011 · 4650591 · 4650591
2 parents ab2fec0 + a2da4ef
commit 4650591
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/fabric_view_changes.erl b/src/fabric_view_changes.erl
@@ -130,9 +130,9 @@ send_changes(DbName, ChangesArgs, Callback, PackedSeqs, AccIn, Timeout) ->
 receive_results(Workers, State, Timeout, Callback, AccIn) ->
     case rexi_utils:recv(Workers, #shard.ref, fun handle_message/3, State,
             infinity, Timeout) of
-    {timeout, _NewState} ->
+    {timeout, NewState0} ->
         {ok, AccOut} = Callback(timeout, AccIn),
-        NewState = State#collector{user_acc = AccOut},
+        NewState = NewState0#collector{user_acc = AccOut},
         receive_results(Workers, NewState, Timeout, Callback, AccOut);
     {_, NewState} ->
         {ok, NewState}