--- a/javamanager/javalauncher/src.s60/javalauncher.cpp	Thu Jul 15 18:31:06 2010 +0300
+++ b/javamanager/javalauncher/src.s60/javalauncher.cpp	Thu Aug 19 09:48:13 2010 +0300
@@ -92,7 +92,7 @@
     JavaStorageApplicationList_t  foundEntries;
 
 
-    // Get MIDlet-n from APPLICATION_PACKAGE_ATTRIBUTES_TABLE based on 
+    // Get MIDlet-n from APPLICATION_PACKAGE_ATTRIBUTES_TABLE based on
     // PACKAGE_ID and NAME.
     attribute.setEntry(ID, aPackageId);
     findPattern.insert(attribute);
@@ -107,7 +107,7 @@
         return KErrNotFound;
     }
 
-    // Found the MIDlet-n argument. Now getting the MIDlet name and 
+    // Found the MIDlet-n argument. Now getting the MIDlet name and
     // main class. Name is the first argument and main class is the last
     // in the comma separated list.
     std::wstring value = foundEntries.front().begin()->entryValue();
@@ -549,6 +549,10 @@
         err = getUidFromCommandLine(cmdLineBuf, uid);
         if (KErrNone != err)
         {
+            ELOG1WSTR(EJavaCaptain,
+                "JavaLauncher: process command line was %s",
+                 (wchar_t *)(cmdLineBuf.PtrZ()));
+
             CleanupStack::PopAndDestroy(pBufCmdLine);
             CleanupStack::PopAndDestroy(commandLine);
             return err;
@@ -672,8 +676,8 @@
         LOG(EJavaCaptain, EInfo, "javalauncher: startJavaCaptain javacaptain.exe was started ok");
 #endif
 
-        // Wait 3 seconds so that Java Captain has time to start
-        User::After(3000000);
+        // Wait 3 seconds so that Java Captain has time to start and get read to answer Comms
+        User::After(3000000); // codescanner::userafter
     }
     else
     {
@@ -773,6 +777,8 @@
               "javalauncher: OMJ app launch: Exception %s caught", e.what());
     }
 
+    delete pBufCmdLine;
+
     return err;
 }