--- a/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/plugin/src/EapSim.cpp Thu Jun 10 16:12:28 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/gsmsim/symbian/plugin/src/EapSim.cpp Thu Jun 24 11:23:08 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 24 %
+* %version: 26 %
*/
// This is enumeration of EAPOL source code.
@@ -205,11 +205,14 @@
RFs session;
- EapSimDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-
CleanupClosePushL(session);
CleanupClosePushL(db);
-
+ TInt error = session.Connect();
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapSim::SetIndexL(): - session.Connect(), error=%d\n"), error));
+ User::LeaveIfError(error);
+
+ EapSimDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
+
EapSimDbUtils::SetIndexL(
db,
iIndexType,
@@ -222,6 +225,9 @@
iIndexType = aIndexType;
iIndex = aIndex;
+ db.Close();
+ session.Close();
+
CleanupStack::PopAndDestroy(&db);
CleanupStack::PopAndDestroy(&session);
}
@@ -232,11 +238,14 @@
RFs session;
+ CleanupClosePushL(session);
+ CleanupClosePushL(db);
+ TInt error = session.Connect();
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapSim::SetConfigurationL(): - session.Connect(), error=%d\n"), error));
+ User::LeaveIfError(error);
+
// This also creates the IAP entry if it doesn't exist
EapSimDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-
- CleanupClosePushL(session);
- CleanupClosePushL(db);
EapSimDbUtils::SetConfigurationL(
db,
@@ -245,6 +254,9 @@
iIndex,
iTunnelingType);
+ db.Close();
+ session.Close();
+
CleanupStack::PopAndDestroy(&db);
CleanupStack::PopAndDestroy(&session);
}
@@ -255,11 +267,14 @@
RFs session;
+ CleanupClosePushL(session);
+ CleanupClosePushL(db);
+ TInt error = session.Connect();
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapSim::SetConfigurationL(): - session.Connect(), error=%d\n"), error));
+ User::LeaveIfError(error);
+
// This also creates the IAP entry if it doesn't exist
EapSimDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-
- CleanupClosePushL(session);
- CleanupClosePushL(db);
EapSimDbUtils::GetConfigurationL(
db,
@@ -268,6 +283,9 @@
iIndex,
iTunnelingType);
+ db.Close();
+ session.Close();
+
CleanupStack::PopAndDestroy(&db);
CleanupStack::PopAndDestroy(&session);
}
@@ -295,11 +313,14 @@
RFs session;
- EapSimDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-
CleanupClosePushL(session);
CleanupClosePushL(db);
-
+ TInt error = session.Connect();
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapSim::CopySettingsL(): - session.Connect(), error=%d\n"), error));
+ User::LeaveIfError(error);
+
+ EapSimDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
+
EapSimDbUtils::CopySettingsL(
db,
iIndexType,
@@ -309,6 +330,9 @@
aDestinationIndex,
iTunnelingType);
+ db.Close();
+ session.Close();
+
CleanupStack::PopAndDestroy(&db);
CleanupStack::PopAndDestroy(&session);