fix MODLANG-41

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5623 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index 959515206ed7240fcf9cbe3ec2374d63f696562b..160831b0d203b22d6f94c0c68af56c6040e468cc 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -2752,24 +2752,31 @@ static JSBool js_bridge(JSContext * cx, JSObject * obj, uintN argc, jsval * argv
        struct input_callback_state cb_state = { 0 };
        JSFunction *function;
 
+       *rval = BOOLEAN_TO_JSVAL(JS_FALSE);
+
        if (argc > 1) {
                if (JS_ValueToObject(cx, argv[0], &session_obj_a)) {
                        if (!(jss_a = JS_GetPrivate(cx, session_obj_a))) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Find Session [1]\n");
-                               return JS_FALSE;
+                               eval_some_js("~throw new Error(\"Cannot find session A\");", cx, obj, rval);
+                               return JS_TRUE;
                        }
                }
                if (JS_ValueToObject(cx, argv[1], &session_obj_b)) {
                        if (!(jss_b = JS_GetPrivate(cx, session_obj_b))) {
-                               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Find Session [1]\n");
-                               return JS_FALSE;
+                               eval_some_js("~throw new Error(\"Cannot find session B\");", cx, obj, rval);
+                               return JS_TRUE;
                        }
                }
        }
 
-       if (!(jss_a && jss_b)) {
-               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failure! %s %s\n", jss_a ? "y" : "n", jss_b ? "y" : "n");
-               return JS_FALSE;
+       if (!(jss_a && jss_a->session)) {
+               eval_some_js("~throw new Error(\"session A is not ready!\");", cx, obj, rval);
+               return JS_TRUE;
+       }
+
+       if (!(jss_b && jss_b->session)) {
+               eval_some_js("~throw new Error(\"session B is not ready!\");", cx, obj, rval);
+               return JS_TRUE;
        }
 
 
@@ -2796,6 +2803,7 @@ static JSBool js_bridge(JSContext * cx, JSObject * obj, uintN argc, jsval * argv
        switch_ivr_multi_threaded_bridge(jss_a->session, jss_b->session, dtmf_func, bp, bp);
        JS_ResumeRequest(cx, cb_state.saveDepth);
 
+       *rval = BOOLEAN_TO_JSVAL(JS_TRUE);
 
        return JS_TRUE;
 }

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index e711987a7135c1947fcc0a4b7884b5dce72c45fa..c7dc451e419350a7303ad5915a9f7a7cba19308c 100644 (file)
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -551,6 +551,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
        int stream_id = 0;
        switch_status_t status = SWITCH_STATUS_SUCCESS;
        
+       assert(session != NULL);
+       assert(peer_session != NULL);
+
        caller_channel = switch_core_session_get_channel(session);
        assert(caller_channel != NULL);