--- a/applayerprotocols/httptransportfw/core/CTransaction.cpp Wed Jun 23 18:48:21 2010 +0300
+++ b/applayerprotocols/httptransportfw/core/CTransaction.cpp Tue Jul 06 14:51:44 2010 +0300
@@ -38,13 +38,10 @@
{
// Delete all current events.
iEventQueue.Reset();
- if(iStatus != ECancelled)
- {
- // Cancel the active object
- Cancel();
- // And send the cancel event
- SynchronousSendEvent(THTTPEvent::ECancel, THTTPEvent::EOutgoing, aStart);
- }
+ // Cancel the active object
+ Cancel();
+ // And send the cancel event
+ SynchronousSendEvent(THTTPEvent::ECancel, THTTPEvent::EOutgoing, aStart);
if (iStatus != EInFilter && iStatus != ECancelled)
iStatus = EPassive;
else
@@ -61,7 +58,6 @@
{
CHeaderFieldPart::ClosePropertySet(iPropertySet);
delete iRequest;
- iRequest = NULL;
delete this;
return;
}
@@ -85,10 +81,8 @@
iSession.RemoveTransaction(this);
CHeaderFieldPart::ClosePropertySet(iPropertySet);
delete iRequest;
- iRequest = NULL;
delete iResponse;
- iResponse = NULL;
-
+
// Cancel the active object
Cancel();