--- a/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp	Thu Jun 10 16:12:28 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/mschapv2/symbian/plugin/src/EapMsChapV2.cpp	Thu Jun 24 11:23:08 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 28 %
+* %version: 30 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -246,11 +246,14 @@
 
 	RFs session;
 	
-	EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-	
 	CleanupClosePushL(session);
 	CleanupClosePushL(db);
-		
+	TInt error = session.Connect();
+	EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::SetIndexL(): - session.Connect(), error=%d\n"), error));
+	User::LeaveIfError(error);
+
+	EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
+
 	EapMsChapV2DbUtils::SetIndexL(
 		db, 
 		iIndexType, 
@@ -263,6 +266,9 @@
 	iIndexType = aIndexType;
 	iIndex = aIndex;
 
+	db.Close();
+	session.Close();
+
 	CleanupStack::PopAndDestroy(&db);
 	CleanupStack::PopAndDestroy(&session);
 }
@@ -276,11 +282,14 @@
 
 	RFs session;
 	
+	CleanupClosePushL(session);
+	CleanupClosePushL(db);
+	TInt error = session.Connect();
+	EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::SetConfigurationL(): - session.Connect(), error=%d\n"), error));
+	User::LeaveIfError(error);
+
 	// This also creates the IAP entry if it doesn't exist
 	EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-	
-	CleanupClosePushL(session);
-	CleanupClosePushL(db);
 
 	EapMsChapV2DbUtils::SetConfigurationL(
 		db,
@@ -289,6 +298,9 @@
 		iIndex,
 		iTunnelingType);		
 		
+	db.Close();
+	session.Close();
+
 	CleanupStack::PopAndDestroy(&db);
 	CleanupStack::PopAndDestroy(&session);
 }
@@ -302,11 +314,14 @@
 
 	RFs session;
 	
+	CleanupClosePushL(session);
+	CleanupClosePushL(db);
+	TInt error = session.Connect();
+	EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::GetConfigurationL(): - session.Connect(), error=%d\n"), error));
+	User::LeaveIfError(error);
+
 	// This also creates the IAP entry if it doesn't exist
 	EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-	
-	CleanupClosePushL(session);
-	CleanupClosePushL(db);
 
 	EapMsChapV2DbUtils::GetConfigurationL(
 		db,
@@ -315,6 +330,9 @@
 		iIndex,
 		iTunnelingType);
 		
+	db.Close();
+	session.Close();
+
 	CleanupStack::PopAndDestroy(&db);
 	CleanupStack::PopAndDestroy(&session);
 }
@@ -345,11 +363,14 @@
 
 	RFs session;
 	
-	EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-	
 	CleanupClosePushL(session);
 	CleanupClosePushL(db);
-		
+	TInt error = session.Connect();
+	EAP_TRACE_DEBUG_SYMBIAN((_L("CEapMsChapV2::CopySettingsL(): - session.Connect(), error=%d\n"), error));
+	User::LeaveIfError(error);
+
+	EapMsChapV2DbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
+
 	EapMsChapV2DbUtils::CopySettingsL(
 		db,
 		iIndexType,
@@ -359,6 +380,9 @@
 		aDestinationIndex, 
 		iTunnelingType);
 		
+	db.Close();
+	session.Close();
+
 	CleanupStack::PopAndDestroy(&db);
 	CleanupStack::PopAndDestroy(&session);