Revert rev10436. Correct patch already applied in 3.1.19

diff --git a/src/BodyPipe.cc b/src/BodyPipe.cc
index fdd6b4ca0c1fcf0ea143bf541ad20b0bf3bc4a83..417e1bbd4b19059af0c6253e37586857000b6850 100644 (file)
--- a/src/BodyPipe.cc
+++ b/src/BodyPipe.cc
@@ -258,28 +258,14 @@ BodyPipe::clearConsumer()
 void
 BodyPipe::expectNoConsumption()
 {
-    // We may be called multiple times because multiple jobs on the consumption
-    // chain may realize that there will be no more setConsumer() calls (e.g.,
-    // consuming code and retrying code). It is both difficult and not really
-    // necessary for them to coordinate their expectNoConsumption() calls.
-
-    // As a consequence, we may be called when we are auto-consuming already.
-
+    Must(!theConsumer);
     if (!abortedConsumption && !exhausted()) {
-        // Before we abort, any regular consumption should be over and auto
-               // consumption must not be started.
-        Must(!theConsumer);
-
         AsyncCall::Pointer call= asyncCall(91, 7,
                                            "BodyProducer::noteBodyConsumerAborted",
                                            BodyProducerDialer(theProducer,
                                                               &BodyProducer::noteBodyConsumerAborted, this));
         ScheduleCallHere(call);
         abortedConsumption = true;
-
-        // in case somebody enabled auto-consumption before regular one aborted
-        if (mustAutoConsume)
-            startAutoConsumption();
     }
 }