From 856c5c3b95a96ae97348b16d417c6f7eaa3da48f Mon Sep 17 00:00:00 2001 From: Werner Dittmann Date: Mon, 28 Dec 2009 11:50:36 +0000 Subject: [PATCH] Revert previous commit - wrong file and comment. --- .../impl/protocol/sip/CallPeerSipImpl.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java index 1c43e54b0..0a737a3fb 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerSipImpl.java @@ -795,12 +795,6 @@ public void logAndFail(String message, Throwable throwable) */ public void processAck(ServerTransaction serverTransaction, Request ack) { -// CallPeerState peerState = getState(); -// if (!CallPeerState.isOnHold(peerState)) -// { -// setState(CallPeerState.CONNECTED); -// } - ContentLengthHeader contentLength = ack.getContentLength(); if ((contentLength != null) && (contentLength.getContentLength() > 0)) { @@ -901,9 +895,6 @@ public void processInviteOK(ClientTransaction clientTransaction, return; } - if (!CallPeerState.isOnHold(getState())) - setState(CallPeerState.CONNECTED); - try { //Process SDP unless we've just had an answer in a 18X response @@ -939,8 +930,8 @@ public void processInviteOK(ClientTransaction clientTransaction, } // change status -// if (!CallPeerState.isOnHold(getState())) -// setState(CallPeerState.CONNECTED); + if (!CallPeerState.isOnHold(getState())) + setState(CallPeerState.CONNECTED); fireResponseProcessed(ok, null); }