projects
/
platform
/
core
/
dotnet
/
launcher.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exit app if fail to open plugin library (#449)
[platform/core/dotnet/launcher.git]
/
NativeLauncher
/
launcher
/
lib
/
core_runtime.cc
diff --git
a/NativeLauncher/launcher/lib/core_runtime.cc
b/NativeLauncher/launcher/lib/core_runtime.cc
index
385bb60
..
5f1be89
100644
(file)
--- a/
NativeLauncher/launcher/lib/core_runtime.cc
+++ b/
NativeLauncher/launcher/lib/core_runtime.cc
@@
-189,14
+189,6
@@
static void initEnvForSpecialFolder()
}
}
}
}
-// terminate candidate process when language changed
-// icu related data (CultureInfo, etc) should be recreated.
-static void langChangedCB(keynode_t *key, void* data)
-{
- _INFO("terminiate candidate process to update language.");
- exit(0);
-}
-
static void setLang()
{
char* lang = vconf_get_str(VCONFKEY_LANGSET);
static void setLang()
{
char* lang = vconf_get_str(VCONFKEY_LANGSET);
@@
-344,6
+336,7
@@
int CoreRuntime::initialize(const char* appType, LaunchMode launchMode)
// So, plugin initialize should be called before creating threads.
if (initializePluginManager(appType) < 0) {
_ERR("Failed to initialize PluginManager");
// So, plugin initialize should be called before creating threads.
if (initializePluginManager(appType) < 0) {
_ERR("Failed to initialize PluginManager");
+ return -1;
}
// checkInjection checks dotnet-launcher run mode
}
// checkInjection checks dotnet-launcher run mode
@@
-474,9
+467,6
@@
int CoreRuntime::initialize(const char* appType, LaunchMode launchMode)
}
if (launchMode == LaunchMode::loader) {
}
if (launchMode == LaunchMode::loader) {
- // terminate candidate process if language is changed.
- // CurrentCulture created for preloaded dlls should be updated.
- vconf_notify_key_changed(VCONFKEY_LANGSET, langChangedCB, NULL);
// preload libraries and manage dlls for optimizing startup time
preload();
// preload libraries and manage dlls for optimizing startup time
preload();
@@
-549,12
+539,12
@@
int CoreRuntime::launch(const char* appId, const char* root, const char* path, i
_ERR("executable path is null");
return -1;
}
_ERR("executable path is null");
return -1;
}
-#if 0
+
if (!isFile(path)) {
_ERR("File not exist : %s", path);
return -1;
}
if (!isFile(path)) {
_ERR("File not exist : %s", path);
return -1;
}
-#endif
+
// VD has their own signal handler.
if (!pluginHasLogControl()) {
registerSigHandler();
// VD has their own signal handler.
if (!pluginHasLogControl()) {
registerSigHandler();
@@
-607,8
+597,6
@@
int CoreRuntime::launch(const char* appId, const char* root, const char* path, i
setSwitch("Switch.System.Diagnostics.StackTrace.ShowILOffsets", true);
setSwitch("Switch.System.Diagnostics.StackTrace.ShowILOffsets", true);
- vconf_ignore_key_changed(VCONFKEY_LANGSET, langChangedCB);
-
pluginBeforeExecute();
_INFO("execute assembly : %s", path);
pluginBeforeExecute();
_INFO("execute assembly : %s", path);