Revision: 18044
Author: [email protected]
Date: Thu Apr 21 13:08:29 2011
Log: Fixing test regressions
http://code.google.com/p/mobicents/source/detail?r=18044
Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/InitialRequestDispatcher.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/ProxyBranchTimeoutTest.java
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/Shootist.java
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/InitialRequestDispatcher.java
Thu Apr 21 08:01:30 2011
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/InitialRequestDispatcher.java
Thu Apr 21 13:08:29 2011
@@ -19,7 +19,6 @@
import gov.nist.javax.sip.SipStackExt;
import gov.nist.javax.sip.header.extensions.JoinHeader;
import gov.nist.javax.sip.header.extensions.ReplacesHeader;
-import gov.nist.javax.sip.message.MessageExt;
import java.io.IOException;
import java.io.Serializable;
@@ -40,7 +39,6 @@
import javax.servlet.sip.ar.SipTargetedRequestType;
import javax.sip.Dialog;
import javax.sip.DialogState;
-import javax.sip.ServerTransaction;
import javax.sip.SipException;
import javax.sip.SipProvider;
import javax.sip.address.Address;
@@ -55,11 +53,11 @@
import org.apache.log4j.Logger;
import org.mobicents.servlet.sip.JainSipUtils;
import org.mobicents.servlet.sip.SipFactories;
+import org.mobicents.servlet.sip.address.AddressImpl.ModifiableRule;
import org.mobicents.servlet.sip.address.GenericURIImpl;
import org.mobicents.servlet.sip.address.RFC2396UrlDecoder;
import org.mobicents.servlet.sip.address.SipURIImpl;
import org.mobicents.servlet.sip.address.TelURLImpl;
-import org.mobicents.servlet.sip.address.AddressImpl.ModifiableRule;
import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
import org.mobicents.servlet.sip.core.SipSessionRoutingType;
import
org.mobicents.servlet.sip.core.session.MobicentsSipApplicationSession;
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
Thu Apr 21 08:01:30 2011
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
Thu Apr 21 13:08:29 2011
@@ -97,7 +97,7 @@
// }
public static void sendErrorResponse(int errorCode, SipServletRequestImpl
sipServletRequest, SipProvider sipProvider) {
- MessageDispatcher.sendErrorResponse(Response.SERVER_INTERNAL_ERROR,
(ServerTransaction) sipServletRequest.getTransaction(), (Request)
sipServletRequest.getMessage(), sipProvider);
+ MessageDispatcher.sendErrorResponse(errorCode, (ServerTransaction)
sipServletRequest.getTransaction(), (Request)
sipServletRequest.getMessage(), sipProvider);
if(sipServletRequest.getSipSession() != null) {
sipServletRequest.getSipSession().updateStateOnResponse((SipServletResponseImpl)sipServletRequest.createResponse(SipServletResponseImpl.SC_SERVER_INTERNAL_ERROR),
false);
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Thu Apr 21 08:01:30 2011
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/TestSipListener.java
Thu Apr 21 13:08:29 2011
@@ -1723,10 +1723,10 @@
logger.debug("prackSent ? " + prackSent);
if(requireHeader != null
&& "100rel".equalsIgnoreCase(requireHeader.getOptionTag().trim())
&& !prackSent) {
prackSent = true;
- Request prack =
dialog.createPrack(response);
+ Request prack =
responseDialog.createPrack(response);
ClientTransaction ct = sipProvider
.getNewClientTransaction(prack);
- dialog.sendRequest(ct);
+ responseDialog.sendRequest(ct);
}
}
/**
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/ProxyBranchTimeoutTest.java
Tue Sep 15 02:41:41 2009
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/ProxyBranchTimeoutTest.java
Thu Apr 21 13:08:29 2011
@@ -56,12 +56,20 @@
@Override
public void tearDown() throws Exception {
- sipPhoneSender.dispose();
- for (SipPhone sp : sipPhoneReceivers)
- sp.dispose();
- sipStackSender.dispose();
- for (SipStack ss : sipStackReceivers)
- ss.dispose();
+ if(sipPhoneSender != null) {
+ sipPhoneSender.dispose();
+ }
+ if(sipPhoneReceivers != null) {
+ for (SipPhone sp : sipPhoneReceivers)
+ sp.dispose();
+ }
+ if(sipStackSender != null) {
+ sipStackSender.dispose();
+ }
+ if(sipStackReceivers != null) {
+ for (SipStack ss : sipStackReceivers)
+ ss.dispose();
+ }
super.tearDown();
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/Shootist.java
Thu Apr 21 08:01:30 2011
+++
/trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/proxy/Shootist.java
Thu Apr 21 13:08:29 2011
@@ -323,6 +323,7 @@
try {
if (response.getStatusCode() == Response.OK) {
if (cseq.getMethod().equals(Request.INVITE)) {
+ okToInviteRecevied = true;
Thread.sleep(pauseBeforeAck);
ackRequest =
dialog.createAck(cseq.getSeqNumber());
if(forkingProxy) {
@@ -361,7 +362,7 @@
ex.printStackTrace();
}
}
- okToInviteRecevied = true;
+
} else if
(cseq.getMethod().equals(Request.CANCEL)) {
if (dialog.getState() ==
DialogState.CONFIRMED) {
// oops cancel went in too
late. Need to hang up the
