--- a/javamanager/javasettings/appmngrplugin/src/appmngr2midletsettingshandler.cpp	Wed Sep 01 12:33:18 2010 +0100
+++ b/javamanager/javasettings/appmngrplugin/src/appmngr2midletsettingshandler.cpp	Tue Sep 14 21:06:50 2010 +0300
@@ -244,9 +244,9 @@
 
     findEntry(queryResult, VALUE, value);
 
-    if (value.size() > 0 
+    if (value.size() > 0
         && ((value == L"no")
-        || (value == L"navigationkeys") 
+        || (value == L"navigationkeys")
         || (value == L"gameactions")))
     {
         predefined = true;
@@ -306,7 +306,7 @@
     LOG(EJavaAppMngrPlugin, EInfo, " - CAppMngr2MidletSettingsHandler::SetCurrentSuiteSnapL ");
 }
 
-const std::wstring CAppMngr2MidletSettingsHandler::GetSecurityDomainCategory()
+const std::wstring CAppMngr2MidletSettingsHandler::GetSecurityDomainCategoryL()
 {
     wstring securityDomainCategory = L"";
 
@@ -325,6 +325,7 @@
     catch (JavaStorageException& aJse)
     {
         ELOG1(EJavaAppMngrPlugin, "SECURITY_DOMAIN_CATEGORY value read failed: %d", aJse.mStatus);
+        User::Leave(KErrLocked);
     }
 
     findEntry(queryResult, SECURITY_DOMAIN_CATEGORY, securityDomainCategory);
@@ -333,7 +334,7 @@
 
 }
 
-const std::wstring CAppMngr2MidletSettingsHandler::GetSecurityDomainName()
+const std::wstring CAppMngr2MidletSettingsHandler::GetSecurityDomainNameL()
 {
     wstring securityDomainName = L"";
 
@@ -352,6 +353,7 @@
     catch (JavaStorageException& aJse)
     {
         ELOG1(EJavaAppMngrPlugin, "SECURITY_DOMAIN value read failed: %d", aJse.mStatus);
+        User::Leave(KErrLocked);
     }
 
     findEntry(queryResult, SECURITY_DOMAIN, securityDomainName);