From 83a44a2e1ca373408035e2dd433c8c87ffcc38e6 Mon Sep 17 00:00:00 2001 From: sb Date: Wed, 20 Jan 2010 10:57:46 +0100 Subject: sb119: #i108476# removed obsolete code that deactivates osl signal handler; fixed signature of JNI abort_handler --- jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index dea57e109c0b..b48615bea933 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -178,7 +178,7 @@ rtl::OUString getRuntimeLib(const rtl::ByteSequence & data) jmp_buf jmp_jvm_abort; sig_atomic_t g_bInGetJavaVM = 0; -void abort_handler() +extern "C" void JNICALL abort_handler() { // If we are within JNI_CreateJavaVM then we jump back into getJavaVM if( g_bInGetJavaVM != 0 ) @@ -511,20 +511,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( return JFW_PLUGIN_E_VM_CREATION_FAILED; } - // The office sets a signal handler at startup. That causes a crash - // with java 1.3 under Solaris. To make it work, we set back the - // handler -#ifdef UNX - struct sigaction act; - act.sa_handler=SIG_DFL; - act.sa_flags= 0; - sigaction( SIGSEGV, &act, NULL); - sigaction( SIGPIPE, &act, NULL); - sigaction( SIGBUS, &act, NULL); - sigaction( SIGILL, &act, NULL); - sigaction( SIGFPE, &act, NULL); -#endif - // Some testing with Java 1.4 showed that JavaVMOption.optionString has to // be encoded with the system encoding (i.e., osl_getThreadTextEncoding): JavaVMInitArgs vm_args; -- cgit