diff -r 773449708c84 -r 4ad59aaee882 javaruntimes/standalone/src/javastarterimpl.cpp --- a/javaruntimes/standalone/src/javastarterimpl.cpp Thu Sep 02 20:20:40 2010 +0300 +++ b/javaruntimes/standalone/src/javastarterimpl.cpp Fri Sep 17 08:28:21 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -171,12 +171,12 @@ } JavaStarterImpl::JavaStarterImpl(const std::list& args): - mJvmStarter(0), - mRuntimeStarterUtils(0), - mOriginalArgs(args), - mShudownOk(false), - mIsMainApp(true), - mConfiguration(JvmStarter::UNDEFINED) + mJvmStarter(0), + mRuntimeStarterUtils(0), + mOriginalArgs(args), + mShudownOk(false), + mIsMainApp(true), + mConfiguration(JvmStarter::UNDEFINED) { JELOG2(EJavaRuntime); @@ -212,14 +212,21 @@ // Create the start screen and start it if needed. std::auto_ptr coreUiLoader; - CoreUi& coreUi = CoreUi::getUiInstance(coreUiLoader); if (mUiParams.getScreenMode() != NO_START_SCREEN) { LOG(EJavaRuntime, EInfo, "StartUI"); - coreUi.start(mAppUid, &mUiParams); + CoreUi::start(coreUiLoader, mAppUid, &mUiParams); LOG(EJavaRuntime, EInfo, "StartUI ok"); } + // Add the rest of the JVM args. + for (std::list::const_iterator iter = mFlagArgs.begin(); + iter != mFlagArgs.end(); ++iter) + { + LOG1(EJavaRuntime, EInfo, "Adding args %S", iter->c_str()); + mJvmStarter->appendRawJvmArgument(*iter); + } + // Sets the -jar, -jad, -cp (or -classpath) args if were provided. // Also a main class is set if needed. handleJadJarCpArgs();