ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-12 15:21:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduced JNI version from 1_6 to 1_4, and used javac and jar in PATH not in JAVA_HOME to build (on MacOS)

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5759 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Damjan Jovanovic
2007-09-26 15:13:47 +00:00
parent fdbaad17fe
commit 5fff7be5e1
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/languages/mod_java/freeswitch_java.cpp
+5 -5
View File
@@ -17,7 +17,7 @@ JavaSession::~JavaSession()
JNIEnv *env;
jint res;
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_4);
if (res == JNI_OK)
{
if (cb_state.function)
@@ -57,7 +57,7 @@ void JavaSession::setDTMFCallback(jobject dtmfCallback, char *funcargs)
jobject globalArgs = NULL;
jint res;
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_4);
if (res != JNI_OK)
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error getting JNIEnv!\n");
@@ -104,7 +104,7 @@ void JavaSession::setHangupHook(jobject hangupHook)
jobject globalHangupHook;
jint res;
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_4);
if (res != JNI_OK)
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error getting JNIEnv!\n");
@@ -143,7 +143,7 @@ void JavaSession::check_hangup_hook()
return;
}
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_4);
if (res == JNI_EDETACHED)
{
res = javaVM->AttachCurrentThread((void**)&env, NULL);
@@ -185,7 +185,7 @@ switch_status_t JavaSession::run_dtmf_callback(void *input, switch_input_type_t
return SWITCH_STATUS_FALSE;
}
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_6);
res = javaVM->GetEnv((void**)&env, JNI_VERSION_1_4);
if (res != JNI_OK)
{
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "error getting JNIEnv!\n");