FCL/sf/app/jrt: comparison javaruntimes/midp/runtime/javasrc/com/nokia/mj/impl/rt/midp/MidletLifeCycle.java

equal deleted inserted replaced

-:2a9601315dfc
+:98ccebc37403
 * shut down procedure, it is a responsibility of the Java Captain to terminate
 * the MIDP process. The MIDP runtime tries to close gracefully the JVM, but
 * that will fail if any of the started Java threads dont stop as a result of
 * shut down notifications. That is considered a failure in the shut down phase
 * and the Java Captain will terminate forcefully the process.
-*
-* @author Nokia Corporation
-* @version $Rev$
 */
 final class MidletLifeCycle
 {
 /**
 * Possible states of the state machine
 private static final int STOPPING_MIDLET = 0x40;
 private static final int CLOSED          = 0x80;
 private static final int RESUMING        = 0x100;
 /**
-* A singleton instance of the life cycle. It is singleton for provoding
+* A singleton instance of the life cycle.
-* easy access to all other classes of the MIDP runtime.
 */
 private static MidletLifeCycle       mInstance = new MidletLifeCycle();
 /**
 * Timers for ensuring that correct actions are done if MIDlet doesn't
 if (mRuntimeErrDialog != null)
 {
 mRuntimeErrDialog.showDialog();
 }
-if (Log.mOn) Log.logI("Sending close indication to runtime starter.");
-_closeInd(mNativeRuntimeStarterHandle);
-if (Log.mOn) Log.logI("Sending shutdown notifications to listeners.");
-ApplicationUtilsImpl.doShutdownImpl();
 if (!mStandAlone)
 {
 if (Log.mOn) Log.logI("Sending termination indication to Captain.");
 mMidpcomms.sendTerminatedIndication(0);
 if (Log.mOn) Log.logI("Closing COMMS.");
 mMidpcomms.close();
 mMidpcomms = null;
 }
-if (Log.mOn) Log.logI("Short pause before closing dispatchers.");
+if (Log.mOn) Log.logI("Sending shutdown notifications to listeners.");
+ApplicationUtilsImpl.doShutdownImpl();
+if (Log.mOn) Log.logI("Sending close indication to runtime starter.");
+_closeInd(mNativeRuntimeStarterHandle);
+if (Log.mOn) Log.logI("Short pause before closing LegacySupport.");
 try
 {
 Thread.sleep(200);
 }
 catch (Exception e)
 {
 }
-if (Log.mOn) Log.logI("Closing dispatchers.");
+if (Log.mOn) Log.logI("Closing LegacySupport.");
 LegacySupport.close();
 // Setting state to closed.
 mState = CLOSED;
 }
 }
 /**
 * Handles the start request task. Allowed to be called only from
 * startStateMachine() method. The only intention of this method is
-* to diminish the switch case clause in the diminish startStateMachine()
+* to diminish the switch case clause in the startStateMachine()
 * method.
 * @param subTask The sub task provided by the task setter.
 */
 private void handleStartRequest(int subTask)
 {
 if (Log.mOn) Log.logI("MidletLifeCycle.handleStartRequest(), subTask: "
 + subTask);
-if (mState == POST_INIT_DONE || (mState == PRE_INIT_DONE &&
+if ((mState == POST_INIT_DONE && subTask != LifeCycleTask.PRE_WARM_START) ||
-subTask == LifeCycleTask.PRE_WARM_START))
+(mState == PRE_INIT_DONE && subTask == LifeCycleTask.PRE_WARM_START))
 {
 if (subTask == LifeCycleTask.NORMAL_START)
 {
 if (Log.mOn) Log.logI("  Normal start");
 mState = STARTING_MIDLET;
 // Set protected and restricted packages.
 setClassProtection();
 // Check if there are add-on JSRs.
 ExtensionUtil.handleExtensions();
+}
+else
+{
+ApplicationUtilsImpl.setStandAloneMode();
 }
 mTaskQueue = new TaskQueue();
 // If system property com.nokia.mid.cmdline has value, it contains
 // The native peer doesn't know the UID of the started MIDlet.
 // Informing native.
 _setUids(mMidletUid.toString(),
 ApplicationInfoImpl.getMidletInfo().getSuiteUid().toString(),
 mNativeRuntimeStarterHandle);
-// The Jvm doesn't know about MIDlet class path - need to set it.
-String classPath = ApplicationInfoImpl.getMidletInfo().getClassPath();
-if (Log.mOn) Log.logI("  Adding to classpath: "+classPath);
-JvmInternal.appendToClassPath(classPath);
 }
 private void doPostInit()
 {
 if (Log.mOn) Log.logI("Doing post init.");
 // In case of pre-warm start we need to create the core ui
 // from Java side. In order to ensure that Runtime Support
 // API works ok, the setMidletInfo must be called before
 // starting the UI.
 CoreUi.createUi(mMidletUid, mBackGroundStart);
+// The Jvm doesn't know about MIDlet class path - need to set it.
+String classPath = ApplicationInfoImpl.getMidletInfo().getClassPath();
+if (Log.mOn) Log.logI("  Adding to classpath: "+classPath);
+JvmInternal.appendToClassPath(classPath);
 }
 if (!mStandAlone)
 {
 // Do the MIDlet suite authentication.

changeset 23	98ccebc37403
parent 21	2a9601315dfc
child 25	9ac0a0a7da70