--- a/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/plugin/src/EapAka.cpp Thu Jun 10 16:12:28 2010 +0300
+++ b/eapol/eapol_framework/eapol_symbian/am/type/aka/symbian/plugin/src/EapAka.cpp Thu Jun 24 11:23:08 2010 +0300
@@ -16,7 +16,7 @@
*/
/*
-* %version: 23 %
+* %version: 25 %
*/
// This is enumeration of EAPOL source code.
@@ -206,11 +206,14 @@
RFs session;
+ CleanupClosePushL(session);
+ CleanupClosePushL(db);
+ TInt error = session.Connect();
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapAka::SetIndexL(): - session.Connect(), error=%d\n"), error));
+ User::LeaveIfError(error);
+
EapAkaDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
- CleanupClosePushL(session);
- CleanupClosePushL(db);
-
EapAkaDbUtils::SetIndexL(
db,
iIndexType,
@@ -223,6 +226,9 @@
iIndexType = aIndexType;
iIndex = aIndex;
+ db.Close();
+ session.Close();
+
CleanupStack::PopAndDestroy(&db);
CleanupStack::PopAndDestroy(&session);
}
@@ -235,12 +241,15 @@
RFs session;
+ CleanupClosePushL(session);
+ CleanupClosePushL(db);
+ TInt error = session.Connect();
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapAka::SetConfigurationL(): - session.Connect(), error=%d\n"), error));
+ User::LeaveIfError(error);
+
// This also creates the IAP entry if it doesn't exist
EapAkaDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
- CleanupClosePushL(session);
- CleanupClosePushL(db);
-
EapAkaDbUtils::SetConfigurationL(
db,
aSettings,
@@ -248,6 +257,9 @@
iIndex,
iTunnelingType);
+ db.Close();
+ session.Close();
+
CleanupStack::PopAndDestroy(&db);
CleanupStack::PopAndDestroy(&session);
}
@@ -260,11 +272,14 @@
RFs session;
+ CleanupClosePushL(session);
+ CleanupClosePushL(db);
+ TInt error = session.Connect();
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapAka::SetConfigurationL(): - session.Connect(), error=%d\n"), error));
+ User::LeaveIfError(error);
+
// This also creates the IAP entry if it doesn't exist
EapAkaDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-
- CleanupClosePushL(session);
- CleanupClosePushL(db);
EapAkaDbUtils::GetConfigurationL(
db,
@@ -273,6 +288,9 @@
iIndex,
iTunnelingType);
+ db.Close();
+ session.Close();
+
CleanupStack::PopAndDestroy(&db);
CleanupStack::PopAndDestroy(&session);
}
@@ -302,11 +320,14 @@
RFs session;
- EapAkaDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
-
CleanupClosePushL(session);
CleanupClosePushL(db);
-
+ TInt error = session.Connect();
+ EAP_TRACE_DEBUG_SYMBIAN((_L("CEapAka::CopySettingsL(): - session.Connect(), error=%d\n"), error));
+ User::LeaveIfError(error);
+
+ EapAkaDbUtils::OpenDatabaseL(db, session, iIndexType, iIndex, iTunnelingType);
+
EapAkaDbUtils::CopySettingsL(
db,
iIndexType,
@@ -316,6 +337,9 @@
aDestinationIndex,
iTunnelingType);
+ db.Close();
+ session.Close();
+
CleanupStack::PopAndDestroy(&db);
CleanupStack::PopAndDestroy(&session);
}