kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-29 13:43:07 +00:00
Code Issues Projects Releases Wiki Activity

FS-4743 --resolve

Browse Source
This commit is contained in:
Brian West 2012-11-01 15:00:28 -05:00
parent b4502078cf
commit efcd5656fb
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/mod/languages/mod_java/modjava.c
View File

@ -38,7 +38,7 @@ static switch_memory_pool_t *memoryPool = NULL;
static switch_dso_handle_t *javaVMHandle = NULL; static switch_dso_handle_t *javaVMHandle = NULL;
JavaVM *javaVM = NULL; JavaVM *javaVM = NULL;
jclass launcherClass = NULL;
SWITCH_MODULE_LOAD_FUNCTION(mod_java_load); SWITCH_MODULE_LOAD_FUNCTION(mod_java_load);
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_java_shutdown); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_java_shutdown);
@ -62,19 +62,16 @@ static vm_control_t vmControl;
static void launch_java(switch_core_session_t *session, const char *data, JNIEnv *env) static void launch_java(switch_core_session_t *session, const char *data, JNIEnv *env)
{ {
jclass Launcher = NULL;
jmethodID launch = NULL; jmethodID launch = NULL;
jstring uuid = NULL; jstring uuid = NULL;
jstring args = NULL; jstring args = NULL;
Launcher = (*env)->FindClass(env, "org/freeswitch/Launcher"); if (launcherClass == NULL)
if (Launcher == NULL)
{ {
(*env)->ExceptionDescribe(env);
goto done; goto done;
} }
launch = (*env)->GetStaticMethodID(env, Launcher, "launch", "(Ljava/lang/String;Ljava/lang/String;)V"); launch = (*env)->GetStaticMethodID(env, launcherClass, "launch", "(Ljava/lang/String;Ljava/lang/String;)V");
if (launch == NULL) if (launch == NULL)
{ {
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
@ -95,7 +92,7 @@ static void launch_java(switch_core_session_t *session, const char *data, JNIEnv
goto done; goto done;
} }
(*env)->CallStaticVoidMethod(env, Launcher, launch, uuid, args); (*env)->CallStaticVoidMethod(env, launcherClass, launch, uuid, args);
if ((*env)->ExceptionOccurred(env)) if ((*env)->ExceptionOccurred(env))
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
@ -104,8 +101,6 @@ done:
(*env)->DeleteLocalRef(env, args); (*env)->DeleteLocalRef(env, args);
if (uuid != NULL) if (uuid != NULL)
(*env)->DeleteLocalRef(env, uuid); (*env)->DeleteLocalRef(env, uuid);
if (Launcher != NULL)
(*env)->DeleteLocalRef(env, Launcher);
} }
static switch_status_t exec_user_method(user_method_t * userMethod) { static switch_status_t exec_user_method(user_method_t * userMethod) {
@ -145,12 +140,14 @@ static switch_status_t exec_user_method(user_method_t * userMethod) {
goto done; goto done;
} }
arg = (*env)->NewStringUTF(env, userMethod->arg); if (userMethod->arg != NULL) {
arg = (*env)->NewStringUTF(env, userMethod->arg);
if (arg == NULL) { if (arg == NULL) {
(*env)->ExceptionDescribe(env); (*env)->ExceptionDescribe(env);
status = SWITCH_STATUS_FALSE; status = SWITCH_STATUS_FALSE;
goto done; goto done;
}
} }
(*env)->CallStaticVoidMethod(env, class, method, arg); (*env)->CallStaticVoidMethod(env, class, method, arg);
@ -311,8 +308,31 @@ static switch_status_t create_java_vm(JavaVMOption *options, int optionCount, vm
res = pJNI_CreateJavaVM(&javaVM, (void*) &env, &initArgs); res = pJNI_CreateJavaVM(&javaVM, (void*) &env, &initArgs);
if (res == JNI_OK) if (res == JNI_OK)
{ {
// call FindClass here already so that the Java VM executes the static
// initializer (@see org.freeswitch.Launcher) which loads the jni library
// so we can use jni functions right away (for example in the startup method)
launcherClass = (*env)->FindClass(env, "org/freeswitch/Launcher");
if ( launcherClass == NULL )
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to find 'org.freeswitch.Launcher' class!\n");
(*env)->ExceptionDescribe(env);
status = SWITCH_STATUS_FALSE;
}
// store a global reference for use in the launch_java() function
launcherClass = (*env)->NewGlobalRef(env, launcherClass);
if ( launcherClass == NULL )
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Out of memory!\n");
(*env)->ExceptionDescribe(env);
status = SWITCH_STATUS_FALSE;
}
else
{
status = SWITCH_STATUS_SUCCESS;
}
(*javaVM)->DetachCurrentThread(javaVM); (*javaVM)->DetachCurrentThread(javaVM);
status = SWITCH_STATUS_SUCCESS;
} }
else else
{ {