Revision: 15672
Author: [email protected]
Date: Wed Dec  8 02:34:48 2010
Log: Fixes Issue 2192
http://code.google.com/p/mobicents/source/detail?r=15672

Modified:
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java /trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java Thu Apr 1 02:15:30 2010 +++ /trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java Wed Dec 8 02:34:48 2010
@@ -244,10 +244,12 @@
                // Fix for 
http://code.google.com/p/mobicents/issues/detail?id=1386 :
// Ensure SipApplicationSession concurrency control on converged HTTP apps
                context.enterSipApp(sipApplicationSessionImpl, null);
-
-        wrapper.getPipeline().getFirst().invoke(request, response);
-        context.exitSipApp(sipApplicationSessionImpl, null);
-        context.exitSipAppHa(null, null);
+               try {
+                       wrapper.getPipeline().getFirst().invoke(request, 
response);
+               } finally {
+               context.exitSipApp(sipApplicationSessionImpl, null);
+               context.exitSipAppHa(null, null);
+               }
// Fix for Issue 882 :remove the http session from the thread local to avoid any leaking of the session
         context.getSipFactoryFacade().removeHttpSession();

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java Thu Apr 1 02:15:30 2010 +++ /trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java Wed Dec 8 02:34:48 2010
@@ -244,11 +244,12 @@
                // Fix for 
http://code.google.com/p/mobicents/issues/detail?id=1386 :
// Ensure SipApplicationSession concurrency control on converged HTTP apps
                context.enterSipApp(sipApplicationSessionImpl, null);
-
-        wrapper.getPipeline().getFirst().invoke(request, response);
-
-        context.exitSipApp(sipApplicationSessionImpl, null);
-        context.exitSipAppHa(null, null);
+               try {
+                       wrapper.getPipeline().getFirst().invoke(request, 
response);
+               } finally {
+               context.exitSipApp(sipApplicationSessionImpl, null);
+               context.exitSipAppHa(null, null);
+               }
// Fix for Issue 882 :remove the http session from the thread local to avoid any leaking of the session
         context.getSipFactoryFacade().removeHttpSession();

Reply via email to