--- a/vpnengine/ikev2lib/src/ikev2negotiation.cpp	Tue Feb 02 00:53:00 2010 +0200
+++ b/vpnengine/ikev2lib/src/ikev2negotiation.cpp	Fri Apr 16 16:02:48 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -1532,7 +1532,7 @@
 void CIkev2Negotiation::IkeV2PkiInitCompleteL(TInt aStatus)
     {
 
-    DEBUG_LOG(_L("-> CIkev2Negotiation::IkeV2PkiInitCompleteL"));
+    DEBUG_LOG(_L("CIkev2Negotiation::IkeV2PkiInitCompleteL"));
 	//
 	// The implementation for class MPkiServiceComplete virtual function
 	// This method is called when a PKI service operation is
@@ -1578,7 +1578,6 @@
             break;
         }
         
-    DEBUG_LOG(_L("<- CIkev2Negotiation::IkeV2PkiInitCompleteL"));        
     }
     
 
@@ -2620,7 +2619,6 @@
 				   DEBUG_LOG1(_L("IKE SA Rekey started by peer for SAID: %d"), iHdr.SaId());							   						   
 				   iState = KStateIkeSARekeyResponse;
 				   Status = ProcessIkeSARekeyL(aIkeMsg);
-				   iIkeV2PlugInSession.UpdateIkev2SAL(&iHdr, NULL);
 				}
 				return Status;
 			}
@@ -2942,8 +2940,7 @@
 		     SendIkeMsgL(ikeMsg);
              if ( (iState != KStateIkeInfoRequest) && (iState != KStateIkeDeleteRequest) && (iState != KStateIkeDeleteResponse) )
                  {
-                 iState = KStateIkeInfoResponse;
-                 iIkeV2PlugInSession.UpdateIkev2SAL(&iHdr, NULL);
+                 iState = KStateIkeSaCompleted;
                  }
 		  }
 	   }
@@ -3187,8 +3184,7 @@
         CleanupStack::Pop(ikeMsg);
         SendIkeMsgL(ikeMsg);
     	CleanupStack::PopAndDestroy(SpiList); 
-		iState = KStateIkeInfoResponse;		
-		iIkeV2PlugInSession.UpdateIkev2SAL(&iHdr, NULL);
+		iState = KStateIkeSaCompleted;		
 		aRequest = EFalse;
 	}