regression fix bug #2583: pure virtual method called

The applied patch hid the problem, did not fix it.
This patch removes the applied patch and instead add an assertion check in
ClientHttpRequest::~ClientHttpRequest destructor just before call the
Adaptation::Initiator::announceInitiatorAbort method.

diff --git a/src/adaptation/Initiator.cc b/src/adaptation/Initiator.cc
index 08608042ddf34297c9dbaaa1ff6bb5cc35b47221..efbfa4821bf829d0a941fa878e4b0e429763a19f 100644 (file)
--- a/src/adaptation/Initiator.cc
+++ b/src/adaptation/Initiator.cc
@@ -24,7 +24,7 @@ Adaptation::Initiator::clearAdaptation(Initiate *&x)
 void
 Adaptation::Initiator::announceInitiatorAbort(Initiate *&x)
 {
-    if (x && cbdataReferenceValid(x)) {
+    if (x) {
         CallJobHere(93, 5, x, Initiate::noteInitiatorAborted);
         clearAdaptation(x);
     }

diff --git a/src/client_side_request.cc b/src/client_side_request.cc
index cd51b7032348c502f9d17a3d72f46c79723f65b6..7b7a6c6785320b3c50fd1bfe30bde4f53354abae 100644 (file)
--- a/src/client_side_request.cc
+++ b/src/client_side_request.cc
@@ -260,6 +260,7 @@ ClientHttpRequest::~ClientHttpRequest()
     freeResources();
 
 #if USE_ADAPTATION
+    assert(cbdataReferenceValid(virginHeadSource));
     announceInitiatorAbort(virginHeadSource);
 
     if (adaptedBodySource != NULL)