Patch for VoiceInterpreter callback doesn't execute when timedout call completed

This close #2301

Author: gvagenas

Diff for: restcomm/restcomm.interpreter/src/main/java/org/restcomm/connect/interpreter/VoiceInterpreter.java

@@ -193,7 +193,6 @@ public final class VoiceInterpreter extends BaseVoiceInterpreter {
     private ActorRef confSubVoiceInterpreter;
     private Attribute dialRecordAttribute;
     private boolean dialActionExecuted = false;
-    private boolean dialCompletedStatusCallBackExecuted = false;
     private ActorRef sender;
     private boolean liveCallModification = false;
     private boolean recordingCall = true;
@@ -2526,7 +2525,6 @@ public void execute(final Object message) throws Exception {
                         }
                         dialChildren = null;
                         callback();
-                        dialCompletedStatusCallBackExecuted = true;
                         return;
                     } else if (dialBranches != null && dialBranches.contains(sender)) {
                         if (logger.isInfoEnabled()) {
@@ -3000,13 +2998,10 @@ public void execute(final Object message) throws Exception {
             }
             if (!dialActionExecuted) {
                 executeDialAction(message, outboundCall);
-                callback(true);
-                dialCompletedStatusCallBackExecuted = true;
             }
 
-            if (!dialCompletedStatusCallBackExecuted) {
-                callback();
-            }
+            callback(true);
+
             // XXX review bridge cleanup!!
 
             // Cleanup bridge

Diff for: restcomm/restcomm.testsuite/src/test/java/org/restcomm/connect/testsuite/telephony/TestDialVerbPartTwo.java

@@ -1484,10 +1484,10 @@ public synchronized void testDialNumberRejectBusyRcml() throws InterruptedExcept
         assertTrue(bobCall.waitOutgoingCallResponse(5 * 1000));
         assertEquals(Response.BUSY_HERE, bobCall.getLastReceivedResponse().getStatusCode());
     }
-    
+
     private String dialClientWithActionRcml = "<Response><Dial action=\"http://127.0.0.1:8090/action\" method=\"GET\"><Client>alice</Client></Dial></Response>";
     private String hangupActionRcml = "<Response><Hangup /></Response>";
-    
+
     @Test // (customised from testDialClientAliceWithRecordAndStatusCallbackForApp)
     public synchronized void testDialClientAliceWithActionAndStatusCallbackForApp() throws InterruptedException, ParseException {
         stubFor(get(urlPathEqualTo("/1111"))
@@ -1543,7 +1543,7 @@ public synchronized void testDialClientAliceWithActionAndStatusCallbackForApp()
         Thread.sleep(3000);
 
         // hangup (must be as alice, the callee, hanging up in order to test the specific issue found)
-        
+
         aliceCall.disconnect();
         bobCall.listenForDisconnect();
         assertTrue(bobCall.waitForDisconnect(3 * 1000));
@@ -1559,9 +1559,9 @@ public synchronized void testDialClientAliceWithActionAndStatusCallbackForApp()
         }
         assertTrue(requests.size()==3);
     }
-    
+
     private String dialTimeOutClientWithActionRcml = "<Response><Dial timeout=\"3\" action=\"http://127.0.0.1:8090/action\" method=\"GET\"><Client>alice</Client></Dial></Response>";
-    
+
     @Test // (customised from testDialClientAliceWithRecordAndStatusCallbackForApp)
     public synchronized void testDialTimeOutClientAliceWithActionAndStatusCallbackForApp() throws InterruptedException, ParseException {
         stubFor(get(urlPathEqualTo("/1111"))
@@ -1609,7 +1609,6 @@ public synchronized void testDialTimeOutClientAliceWithActionAndStatusCallbackFo
 
         assertTrue(aliceCall.waitForIncomingCall(3 * 1000));
         assertTrue(aliceCall.sendIncomingCallResponse(Response.RINGING, "Ringing-Alice", 3600));
-        String receivedBody = new String(aliceCall.getLastReceivedRequest().getRawContent());
 
         aliceCall.listenForCancel();
 
@@ -1618,7 +1617,7 @@ public synchronized void testDialTimeOutClientAliceWithActionAndStatusCallbackFo
         assertTrue(aliceCall.respondToCancel(cancelTransaction, Response.OK, "Alice-OK-2-Cancel", 3600));
 
         // hangup (must be as alice, the callee, hanging up in order to test the specific issue found)
-        
+
         bobCall.listenForDisconnect();
         assertTrue(bobCall.waitForDisconnect(3 * 1000));
         assertTrue(bobCall.respondToDisconnect());
@@ -1631,7 +1630,7 @@ public synchronized void testDialTimeOutClientAliceWithActionAndStatusCallbackFo
         for (LoggedRequest loggedRequest : requests) {
             logger.info("Status callback received: " + loggedRequest.getUrl());
         }
-        assertTrue(requests.size()==4);
+        assertEquals(4, requests.size());
 }
 
     @Deployment(name = "TestDialVerbPartTwo", managed = true, testable = false)