Revision: 15645
Author: [email protected]
Date: Mon Dec  6 10:12:43 2010
Log: Update Issue 1874

non regression custom Proxy Early Dialog ( there is no dialog but failing on 180 really) test case => working
http://code.google.com/p/mobicents/source/detail?r=15645

Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyImpl.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java Thu Dec 2 08:11:40 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java Mon Dec 6 10:12:43 2010
@@ -301,7 +301,7 @@
                                                                
session.updateStateOnResponse(sipServletResponse, true);
                                                                
proxyBranch.setResponse(sipServletResponse);

-                                                               final ProxyImpl 
proxy = (ProxyImpl) proxyBranch.getProxy();
+                                                               final ProxyImpl 
proxy = (ProxyImpl) session.getProxy();
                                                                // Notfiy the 
servlet
                                                                
if(logger.isDebugEnabled()) {
logger.debug("Is Supervised enabled for this proxy branch ? " + proxy.getSupervised());
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Fri Dec 3 10:02:24 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java Mon Dec 6 10:12:43 2010
@@ -1540,7 +1540,9 @@
                if(transaction == null && transactionId != null) {
                        // used for early dialog failover purposes, lazily load 
the transaction
setTransaction(((ClusteredSipStack)StaticServiceHolder.sipStandardService.getSipStack()).findTransaction(transactionId, transactionType)); - transactionApplicationData = (TransactionApplicationData) transaction.getApplicationData();
+            if(transaction != null) {
+ transactionApplicationData = (TransactionApplicationData) transaction.getApplicationData();
+            }
         }
                return this.transaction;
        }
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java Mon Dec 6 06:38:50 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java Mon Dec 6 10:12:43 2010
@@ -44,7 +44,6 @@
 import javax.sip.ClientTransaction;
 import javax.sip.SipException;
 import javax.sip.SipProvider;
-import javax.sip.Transaction;
 import javax.sip.header.RouteHeader;
 import javax.sip.header.ViaHeader;
 import javax.sip.message.Request;
@@ -80,7 +79,7 @@
        private transient SipServletRequestImpl prackOriginalRequest;
        private transient SipServletRequestImpl outgoingRequest;
        private transient SipServletResponseImpl lastResponse;
-       private transient URI targetURI;
+       private URI targetURI;
        private transient SipURI outboundInterface;
        private transient SipURI recordRouteURI;
        private boolean recordRoutingEnabled;
@@ -1028,5 +1027,47 @@
                proxyBranch1xxTimeout= timeout;

        }
+
+       /**
+        * @param outgoingRequest the outgoingRequest to set
+        */
+       public void setOutgoingRequest(SipServletRequestImpl outgoingRequest) {
+               this.outgoingRequest = outgoingRequest;
+       }
+
+       /**
+        * @return the outgoingRequest
+        */
+       public SipServletRequestImpl getOutgoingRequest() {
+               return outgoingRequest;
+       }
+
+       /**
+        * @param originalRequest the originalRequest to set
+        */
+       public void setOriginalRequest(SipServletRequestImpl originalRequest) {
+               this.originalRequest = originalRequest;
+       }
+
+       /**
+        * @return the originalRequest
+        */
+       public SipServletRequestImpl getOriginalRequest() {
+               return originalRequest;
+       }
+
+       /**
+        * @param targetURI the targetURI to set
+        */
+       public void setTargetURI(URI targetURI) {
+               this.targetURI = targetURI;
+       }
+
+       /**
+        * @return the targetURI
+        */
+       public URI getTargetURI() {
+               return targetURI;
+       }

 }
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyImpl.java Thu Oct 21 20:28:27 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyImpl.java Mon Dec 6 10:12:43 2010
@@ -930,6 +930,13 @@
        public ProxyTimerService getProxyTimerService() {
                return proxyTimerService;
        }
+
+       public void addProxyBranch(ProxyBranchImpl proxyBranchImpl) {
+               if(proxyBranches == null) {
+                       this.proxyBranches = new LinkedHashMap<URI, 
ProxyBranchImpl> ();
+               }
+               this.proxyBranches.put(proxyBranchImpl.getTargetURI(), 
proxyBranchImpl);
+       }



Reply via email to