diff -r 2f37ef12b43e -r 1697cc2ba93d networksecurity/tls/protocol/tlsconnection.cpp --- a/networksecurity/tls/protocol/tlsconnection.cpp Thu Sep 16 13:48:44 2010 +0530 +++ b/networksecurity/tls/protocol/tlsconnection.cpp Thu Sep 23 17:23:35 2010 +0530 @@ -53,7 +53,7 @@ CleanupStack::PushL(self); self->ConstructL(aSocket, aProtocol); - CleanupStack::Pop(); + CleanupStack::Pop(self); return self; } @@ -78,7 +78,7 @@ CleanupStack::PushL(self); self->ConstructL(aSocket, aProtocol); - CleanupStack::Pop(); + CleanupStack::Pop(self); return self; } @@ -1190,12 +1190,18 @@ return EFalse; } else - {//delete data path in case it's re-negotiation what's failed - delete iSendAppData; - iSendAppData = NULL; - delete iRecvAppData; - iRecvAppData = NULL; - ResetCryptoAttributes(); + { + if (aStateMachine->LastError() != KErrEof) + { + } + else + { + delete iSendAppData; + iSendAppData = NULL; + delete iRecvAppData; + iRecvAppData = NULL; + ResetCryptoAttributes(); + } } } else