fix MODLANG-56

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8137 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 caf963bbd57737fe3d7555f5106bc00e7c4e4976..278951bd7df41bde5566afc7317833c11089abea 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -2721,7 +2721,7 @@ static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsva
 
                if (JS_ValueToObject(cx, argv[0], &session_obj)) {
                        struct js_session *old_jss = NULL;
-                       if ((old_jss = JS_GetPrivate(cx, session_obj)) && old_jss->session) {
+                       if (session_obj && (old_jss = JS_GetPrivate(cx, session_obj)) && old_jss->session) {
                                session = old_jss->session;
                                orig_caller_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(session));
                                dialplan = orig_caller_profile->dialplan;
@@ -2774,9 +2774,10 @@ static JSBool session_originate(JSContext * cx, JSObject * obj, uintN argc, jsva
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot Create Outgoing Channel! [%s]\n", dest);
                        goto done;
                }
-
+               
                jss->session = peer_session;
                *rval = BOOLEAN_TO_JSVAL(JS_TRUE);
+               switch_channel_set_state(switch_core_session_get_channel(jss->session), CS_TRANSMIT);
 
        } else {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Missing Args\n");
@@ -2803,8 +2804,8 @@ static void session_destroy(JSContext * cx, JSObject * obj)
                                
                                switch_channel_set_private(channel, "jss", NULL);
                                switch_core_event_hook_remove_state_change(session, hanguphook);
-
-                               if (switch_test_flag(jss, S_HUP)) {
+                               
+                               if (switch_test_flag(jss, S_HUP) || switch_channel_get_state(channel) != CS_EXECUTE) {
                                        switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
                                }