Bug 2583: pure virtual method called

Inside the Adaptation::Initiator::announceInitiatorAbort method the check
x==NULL is not enough. We must also check if the x variable (of type Initiate)
is valid.

diff --git a/src/adaptation/Initiator.cc b/src/adaptation/Initiator.cc
index efbfa4821bf829d0a941fa878e4b0e429763a19f..08608042ddf34297c9dbaaa1ff6bb5cc35b47221 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) {
+    if (x && cbdataReferenceValid(x)) {
         CallJobHere(93, 5, x, Initiate::noteInitiatorAborted);
         clearAdaptation(x);
     }