Revision: e8a66ec7121b
Author:   Jean Deruelle <[email protected]>
Date:     Tue Aug  7 03:20:00 2012
Log:      Update Issue 121

Fixes issue with replication, where BYE is sent to only one SIP Endpoint

http://code.google.com/p/sipservlets/source/detail?r=e8a66ec7121b

Modified:
/sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/Call.java /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/CallStatusContainer.java /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/DistributableClick2CallSipServlet.java /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java

=======================================
--- /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/Call.java Mon Aug 6 09:52:36 2012 +++ /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/Call.java Tue Aug 7 03:20:00 2012
@@ -30,9 +30,13 @@
 import javax.servlet.sip.SipSession;
 import javax.servlet.sip.SipApplicationSession.Protocol;

-
-public class Call implements Serializable
-{
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+
+public class Call implements Serializable {
+
+       private static Log logger = LogFactory.getLog(Call.class);
        private String from;
        private String to;
        private String status;
@@ -52,6 +56,7 @@
        }

        public void addSession(SipSession session) {
+ logger.info("adding session " + session.getId() + " to call from " + from + " to " + to);
                this.sessions.add(session.getId());
        }

@@ -59,6 +64,7 @@
                Iterator it = this.sessions.iterator();
                while(it.hasNext()) {
                        String sessionId = (String) it.next();
+ logger.info("sending BYE on session " + sessionId + " of call from " + from + " to " + to); SipSession session = (SipSession) sipApplicationSession.getSession(sessionId, Protocol.SIP);
                        try {
                                session.createRequest("BYE").send();
=======================================
--- /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/CallStatusContainer.java Mon Aug 6 09:52:36 2012 +++ /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/CallStatusContainer.java Tue Aug 7 03:20:00 2012
@@ -26,8 +26,12 @@
 import java.util.HashSet;
 import java.util.Iterator;

+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 public class CallStatusContainer implements Serializable {
-
+       private static Log logger = 
LogFactory.getLog(CallStatusContainer.class);
+
        private HashSet<Call> activeCalls = new HashSet<Call> ();

        public Call addCall(String from, String to, String status) {
=======================================
--- /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/DistributableClick2CallSipServlet.java Mon Aug 6 09:52:36 2012 +++ /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/DistributableClick2CallSipServlet.java Tue Aug 7 03:20:00 2012
@@ -102,11 +102,15 @@
invite.getSession().setAttribute("FirstPartyContent", resp.getContent());

                                Call call = (Call) session.getAttribute("call");
+ CallStatusContainer calls = (CallStatusContainer) resp.getApplicationSession().getAttribute("activeCalls");

                                // The call links the two sessions, add the new 
session to the call
                                call.addSession(invite.getSession());
                                invite.getSession().setAttribute("call", call);

+                               // force the trigger of the application session 
attribute replication
+                               
resp.getApplicationSession().setAttribute("activeCalls", calls);
+
                                invite.send();

                                session.setAttribute("InviteSent", 
Boolean.TRUE);
=======================================
--- /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java Mon Aug 6 09:52:36 2012 +++ /sip-servlets-examples/click2call-distributable/src/main/java/org/mobicents/servlet/sip/example/SimpleWebServlet.java Tue Aug 7 03:20:00 2012
@@ -108,8 +108,7 @@
                }

                // Add the call in the active calls
-               Call call = calls.addCall(fromAddr, toAddr, "FFFF00");
-               appSession.setAttribute("activeCalls", calls);
+               Call call = calls.addCall(fromAddr, toAddr, "FFFF00");

SipServletRequest req = sipFactory.createRequest(appSession, "INVITE", from, to);

@@ -119,6 +118,7 @@

                // This session will be used to send BYE
                call.addSession(req.getSession());
+               appSession.setAttribute("activeCalls", calls);

                logger.info("Sending request" + req);
                // Send the INVITE request

Reply via email to