Skip to content

Commit

Permalink
Work in progress for ticket #34415. Issue #2271.
Browse files Browse the repository at this point in the history
  • Loading branch information
ghjansen committed Nov 26, 2017
1 parent b938ecd commit 5fa921f
Showing 1 changed file with 9 additions and 3 deletions.
Expand Up @@ -824,12 +824,18 @@ else if (is(gathering) || (is(finishGathering) && !super.dtmfReceived)) {
// Finally proceed with call bridging
final JoinCalls bridgeCalls = new JoinCalls(call, outboundCall);
bridge.tell(bridgeCalls, self());
} else if (is(forking) || is(finishDialing) || is(finished)){
} else if (is(forking)){
// Move to next verb once media server completed Play
if((dialBranches == null || dialBranches.size() == 0) && parser != null){
final GetNextVerb next = new GetNextVerb();
parser.tell(next, self());
}
} else if (is(finishDialing)) {
if (parser != null) {
// Move to next verb once media server completed Play
final GetNextVerb next = new GetNextVerb();
parser.tell(next, self());
}
}
} else {
fsm.transition(message, hangingUp);
Expand Down Expand Up @@ -1252,8 +1258,6 @@ private void onCallStateChanged(Object message, ActorRef sender) throws Transiti
} else {
checkDialBranch(message, sender(), attribute);
}
final StopMediaGroup stop = new StopMediaGroup();
call.tell(stop, sender);
break;
} else if (is(conferencing) || is(finishConferencing)) {
//If the CallStateChanged.Completed event from the Call arrived before the ConferenceStateChange.Completed
Expand Down Expand Up @@ -2522,6 +2526,8 @@ public void execute(final Object message) throws Exception {
logger.info("Canceled branch: " + branch.path()+", isTerminated: "+branch.isTerminated());
}
}
// Stop playing the ringing audio from inbound call
call.tell(new StopMediaGroup(), self());
} else if (outboundCall != null) {
outboundCall.tell(new Cancel(), source);
call.tell(new Hangup(outboundCallResponse), self());
Expand Down

0 comments on commit 5fa921f

Please sign in to comment.