From d3666f0fa3b69a2e23f24a2d295cf3ac356ee17b Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Fri, 19 Feb 2016 18:40:46 -0600 Subject: [PATCH] ok this plus (potentially) the removal of those flags makes it work --- .../library/serverScript/src/shared/JavaLibrary.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp index e72e068a..94cb02ff 100755 --- a/engine/server/library/serverScript/src/shared/JavaLibrary.cpp +++ b/engine/server/library/serverScript/src/shared/JavaLibrary.cpp @@ -1330,7 +1330,7 @@ void JavaLibrary::initializeJavaThread() } ms_loaded = 1; -//#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux) +#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux) if (ConfigServerGame::getTrapScriptCrashes()) { //set up signal handler for fatals in linux @@ -1339,7 +1339,7 @@ void JavaLibrary::initializeJavaThread() OurSa.sa_flags = 0; IGNORE_RETURN(sigaction(SIGSEGV, &OurSa, &JavaSa)); } -//#endif +#endif // wait until the main thread tells us to shutdown ms_shutdownJava->wait(); @@ -1348,13 +1348,13 @@ void JavaLibrary::initializeJavaThread() IGNORE_RETURN(ms_jvm->DestroyJavaVM()); ms_jvm = nullptr; -//#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux) +#if !defined(JNI_VERSION_1_9) && !defined(JNI_VERSION_1_8) && !defined(JNI_VERSION_1_7) && defined(linux) if (ConfigServerGame::getTrapScriptCrashes()) { // restore the default signal handler IGNORE_RETURN(sigaction(SIGSEGV, &OrgSa, NULL)); } -//#endif +#endif