--- a/javamanager/javainstaller/installer/src.s60/utils/sysutil.cpp	Wed Sep 15 12:05:25 2010 +0300
+++ b/javamanager/javainstaller/installer/src.s60/utils/sysutil.cpp	Wed Oct 13 14:23:59 2010 +0300
@@ -25,20 +25,13 @@
 #include <sysutil.h>
 #include <driveinfo.h>
 
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-#include "hbextendedlocale.h"
-#endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-
 #include "com_nokia_mj_impl_installer_utils_SysUtil.h"
-#include "javajniutils.h"
 #include "logger.h"
 
 #ifndef KPSUidJavaLatestInstallation
 #define KPSUidJavaLatestInstallation 0x10282567
 #endif
 
-using namespace java::util;
-
 /**
  * Helper method for creating HBufC from jstring.
  */
@@ -93,8 +86,8 @@
     TUid repositoryUid = { aRepository };
     CRepository* repository = CRepository::NewLC(repositoryUid);
     RBuf buf;
+    buf.Create(NCentralRepositoryConstants::KMaxUnicodeStringLength);
     CleanupClosePushL(buf);
-    buf.CreateL(NCentralRepositoryConstants::KMaxUnicodeStringLength);
     TInt err = repository->Get(aKey, buf) ;
     if (KErrNone == err)
     {
@@ -727,21 +720,3 @@
     }
     return value;
 }
-
-/*
- * Class:     com_nokia_mj_impl_installer_utils_SysUtil
- * Method:    _isoToLang
- * Signature: ()[Ljava/lang/String;
- */
-JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_utils_SysUtil__1isoToLang
-(JNIEnv *aEnv, jclass, jstring aLocale)
-{
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-    return HbExtendedLocale::ISOToSymbianLang(
-        QString::fromStdWString(JniUtils::jstringToWstring(aEnv, aLocale)));
-#else // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-    (void)aEnv; // suppress compilation warning about unused argument
-    (void)aLocale; // suppress compilation warning about unused argument
-    return -1;
-#endif // SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
-}