Revision: c25b64010672
Author: Jean Deruelle <[email protected]>
Date: Fri Apr 25 14:45:43 2014 UTC
Log: Update Issue 35
Fix + non regression test
http://code.google.com/p/sipservlets/source/detail?r=c25b64010672
Modified:
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/CancelRequestDispatcher.java
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUATcpUdpTest.java
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/CancelRequestDispatcher.java
Tue Apr 22 19:43:45 2014 UTC
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/CancelRequestDispatcher.java
Fri Apr 25 14:45:43 2014 UTC
@@ -174,7 +174,7 @@
// Issue 1484 :
http://code.google.com/p/mobicents/issues/detail?id=1484
// we terminate the session only for initial requests
if(inviteRequest.isInitial()) {
-
inviteRequest.getSipSession().setState(State.TERMINATED);
+
inviteRequest.getSipSession().setState(State.TERMINATED);
}
try {
Response requestTerminatedResponse = (Response)
inviteResponse.getMessage();
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java
Tue Apr 1 12:35:32 2014 UTC
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java
Fri Apr 25 14:45:43 2014 UTC
@@ -421,8 +421,7 @@
callServlet(sipServletResponse);
}
if(status == 487
&& proxy.allResponsesHaveArrived()) {
-
session.setState(State.TERMINATED);
-
session.setInvalidateWhenReady(true);
+
session.setState(State.TERMINATED);
if(logger.isDebugEnabled()) {
logger.debug("Received 487 on a proxy branch and we are not
waiting on other branches. Setting state to TERMINATED for session " +
session);
}
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Tue Apr 22 19:43:45 2014 UTC
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Fri Apr 25 14:45:43 2014 UTC
@@ -1405,6 +1405,9 @@
public void setState(State state) {
this.state = state;
+ if(state == State.TERMINATED) {
+ setReadyToInvalidate(true);
+ }
}
public void onTerminatedState() {
@@ -1582,7 +1585,6 @@
// the state of the SipSession object becomes
TERMINATED.
else {
setState(State.TERMINATED);
- setReadyToInvalidate(true);
if(logger.isDebugEnabled()) {
logger.debug("the following sip session " + getKey() + " has its
state updated to " + state);
}
@@ -1609,7 +1611,6 @@
if(!hasOngoingSubscriptions) {
if(getProxy() == null || response.getStatus()
!= 487) {
setState(State.TERMINATED);
- setReadyToInvalidate(true);
if(logger.isDebugEnabled()) {
logger.debug("the following sip session " + getKey() + " has its
state updated to " + state);
logger.debug("the following sip session " + getKey() + " is ready to
be invalidated ");
@@ -2087,7 +2088,6 @@
if(!hasOngoingSubscriptions) {
if(subscriptions.size() < 1) {
if((originalMethod != null && okToByeSentOrReceived) |
| !Request.INVITE.equals(originalMethod) ) {
- setReadyToInvalidate(true);
setState(State.TERMINATED);
}
}
=======================================
---
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUATcpUdpTest.java
Fri Dec 14 17:38:28 2012 UTC
+++
/sip-servlets-test-suite/testsuite/src/test/java/org/mobicents/servlet/sip/testsuite/b2bua/B2BUATcpUdpTest.java
Fri Apr 25 14:45:43 2014 UTC
@@ -35,6 +35,9 @@
import org.apache.log4j.Logger;
import org.mobicents.servlet.sip.SipServletTestCase;
+import org.mobicents.servlet.sip.catalina.SipStandardManager;
+import org.mobicents.servlet.sip.startup.SipContextConfig;
+import org.mobicents.servlet.sip.startup.SipStandardContext;
import org.mobicents.servlet.sip.testsuite.ProtocolObjects;
import org.mobicents.servlet.sip.testsuite.TestSipListener;
@@ -58,6 +61,7 @@
TestSipListener receiver;
ProtocolObjects senderProtocolObjects;
ProtocolObjects receiverProtocolObjects;
+ SipStandardManager sipStandardManager = null;
public B2BUATcpUdpTest(String name) {
super(name);
@@ -67,10 +71,16 @@
@Override
public void deployApplication() {
- assertTrue(tomcat.deployContext(
- projectHome
+ "/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/sipapp",
- "sip-test-context",
- "sip-test"));
+ sipStandardManager = new SipStandardManager();
+ SipStandardContext context = new SipStandardContext();
+ context.setDocBase(projectHome
+ "/sip-servlets-test-suite/applications/call-forwarding-b2bua-servlet/src/main/sipapp");
+ context.setName("sip-test-context");
+ context.setPath("/sip-test");
+ context.addLifecycleListener(new SipContextConfig());
+ context.setManager(sipStandardManager);
+ boolean success = tomcat.deployContext(
+ context);
+ assertTrue(success);
}
@Override
@@ -263,7 +273,7 @@
assertTrue(receiver.getByeReceived());
CallIdHeader receiverCallIdHeader =
(CallIdHeader)sender.getInviteRequest().getHeader(CallIdHeader.NAME);
CallIdHeader senderCallIdHeader =
(CallIdHeader)receiver.getInviteRequest().getHeader(CallIdHeader.NAME);
-
assertFalse(receiverCallIdHeader.getCallId().equals(senderCallIdHeader.getCallId()));
+
assertFalse(receiverCallIdHeader.getCallId().equals(senderCallIdHeader.getCallId()));
}
public void testCallForwardingCalleeSendBye() throws Exception {
@@ -321,6 +331,7 @@
SipURI toAddress =
senderProtocolObjects.addressFactory.createSipURI(
toUser, toSipAddress);
+ receiver.setWaitForCancel(true);
sender.sendSipRequest("INVITE", fromAddress, toAddress, null, null,
false);
Thread.sleep(500);
sender.sendCancel();
@@ -331,6 +342,9 @@
CallIdHeader receiverCallIdHeader =
(CallIdHeader)receiver.getInviteRequest().getHeader(CallIdHeader.NAME);
CallIdHeader senderCallIdHeader =
(CallIdHeader)sender.getInviteRequest().getHeader(CallIdHeader.NAME);
assertFalse(receiverCallIdHeader.getCallId().equals(senderCallIdHeader.getCallId()));
+ Thread.sleep(TIMEOUT*2);
+ assertEquals(0,
sipStandardManager.getActiveSipApplicationSessions());
+ assertEquals(0, sipStandardManager.getActiveSipSessions());
}
@Override
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.