--- a/javamanager/javainstaller/installer/src.s60/applicationregistrator/applicationregistrator.cpp	Mon May 03 12:27:20 2010 +0300
+++ b/javamanager/javainstaller/installer/src.s60/applicationregistrator/applicationregistrator.cpp	Fri May 14 15:47:24 2010 +0300
@@ -129,8 +129,8 @@
         return err;
     }
 
-#if 1
-//#ifndef RD_JAVA_USIF_APP_REG
+//#if 1
+#ifndef RD_JAVA_USIF_APP_REG
     // Delete any pending (un)registrations (possible if
     // e.g. device rebooted before commit).
     // This call does nothing if there is no pending registrations.
@@ -169,8 +169,8 @@
  * @param[in] aBackground
  * @return 0 if registration succeeded or Symbian error code
  */
-#if 0
-//#ifdef RD_JAVA_USIF_APP_REG
+//#if 0
+#ifdef RD_JAVA_USIF_APP_REG
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1registerApplication
 (JNIEnv */*aEnv*/, jclass /*aClass*/, jint /*aSessionHandle*/, jint /*aUid*/, jstring /*aGroupName*/,
  jstring /*aMIDletName*/, jstring /*aTargetDrive*/, jstring /*aIconFileName*/,
@@ -486,8 +486,8 @@
  * @param[in] aUid The Uid of the application to be unregistered..
  * @return 0 if unregistration succeeded or Symbian error code
  */
-#if 0
-//#ifdef RD_JAVA_USIF_APP_REG
+//#if 0
+#ifdef RD_JAVA_USIF_APP_REG
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1unregisterApplication
 (JNIEnv *, jclass, jint /*aSessionHandle*/, jint /*aUid*/)
 {
@@ -520,14 +520,15 @@
 JNIEXPORT jint JNICALL Java_com_nokia_mj_impl_installer_applicationregistrator_ApplicationRegistrator__1commitSession
 (JNIEnv *, jclass, jint aSessionHandle, jboolean aSynchronous)
 {
+    (void)aSynchronous; // suppress compilation warning about unused argument
     // Convert session handle to pointer.
     RApaLsSession *pApaSession =
         reinterpret_cast<RApaLsSession*>(aSessionHandle<<2);
 
     TInt err = KErrNone;
 
-#if 1
-//#ifndef RD_JAVA_USIF_APP_REG
+//#if 1
+#ifndef RD_JAVA_USIF_APP_REG
     if (aSynchronous)
     {
         // Make synchronous commit
@@ -585,8 +586,8 @@
         reinterpret_cast<RApaLsSession*>(aSessionHandle<<2);
 
     TInt err = KErrNone;
-#if 1
-//#ifndef RD_JAVA_USIF_APP_REG
+//#if 1
+#ifndef RD_JAVA_USIF_APP_REG
     err = pApaSession->RollbackNonNativeApplicationsUpdates();
 #endif // RD_JAVA_USIF_APP_REG
     pApaSession->Close();