Revision: 36957edb64c8
Author:   josemrecio <[email protected]>
Date:     Sun Jul 22 12:13:52 2012
Log: Additional changes including async extension and listener invocations

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

Modified:
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionAsyncTask.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java

=======================================
--- /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Sat Jul 21 10:32:01 2012 +++ /containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Sun Jul 22 12:13:52 2012
@@ -1372,6 +1372,8 @@
                                                        try {
                                                                final 
ClassLoader cl = getLoader().getClassLoader();
                                                                
Thread.currentThread().setContextClassLoader(cl);
+                                                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                                               
bindThreadBindingListener();

                                                                
switch(event.getEventType()) {
                                                                        case 
SERVLET_INITIALIZED : {
@@ -1419,6 +1421,8 @@
                                                                        
servletHandler = null;
                                                                }
                                                        } finally {
+                                                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                                               
unbindThreadBindingListener();
                                                                
Thread.currentThread().setContextClassLoader(oldClassLoader);
                                                        }
                                                }
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Tue Jul 17 09:32:13 2012 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Sun Jul 22 12:13:52 2012
@@ -537,6 +537,8 @@
final ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
                                final ClassLoader cl = 
sipContext.getSipContextClassLoader();
                                        
Thread.currentThread().setContextClassLoader(cl);
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       sipContext.bindThreadBindingListener();
                                        try {
for (SipConnectorListener connectorListener : sipContext.getListeners().getSipConnectorListeners()) {
                                        try {
@@ -548,6 +550,8 @@
                                                        }
                                    }
                                        } finally {
+                                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                               
sipContext.unbindThreadBindingListener();
                                                
Thread.currentThread().setContextClassLoader(oldClassLoader);
                                        }
                        }
@@ -805,6 +809,8 @@
                                try {
                                        final ClassLoader cl = 
sipContext.getSipContextClassLoader();
                                        
Thread.currentThread().setContextClassLoader(cl);
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       sipContext.bindThreadBindingListener();

                                        try {
                                                if(triggered) {
@@ -815,7 +821,9 @@
                                        } catch (Throwable t) {
                                                logger.error("ContainerListener 
threw exception", t);
                                        }
-                               } finally {
+                               } finally {
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       
sipContext.unbindThreadBindingListener();
                                        
Thread.currentThread().setContextClassLoader(oldClassLoader);
                                }
                        }
@@ -854,13 +862,17 @@
                                                        try {
                                                                final 
ClassLoader cl = sipContext.getSipContextClassLoader();
                                                                
Thread.currentThread().setContextClassLoader(cl);
+                                                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                                               
sipContext.bindThreadBindingListener();

                                                                try {
sipServletResponse = containerListener.onRequestThrottled(sipServletRequest, congestionControlEvent);
                                                                } catch 
(Throwable t) {
                                                                        
logger.error("ContainerListener threw exception", t);
                                                                }
-                                                       } finally {
+                                                       } finally {
+                                                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                                               
sipContext.unbindThreadBindingListener();
                                                                
Thread.currentThread().setContextClassLoader(oldClassLoader);
                                                        }

@@ -1065,6 +1077,8 @@
                                try {
                                        final ClassLoader cl = 
sipContext.getSipContextClassLoader();
                                        
Thread.currentThread().setContextClassLoader(cl);
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       sipContext.bindThreadBindingListener();
                                        final SipManager sipManager = 
sipContext.getSipManager();
final SipApplicationSessionKey sipApplicationSessionKey = SessionManagerUtil.getSipApplicationSessionKey(
                                                        
sipSessionKey.getApplicationName(),
@@ -1143,6 +1157,8 @@
                                        }

                                } finally {
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       
sipContext.unbindThreadBindingListener();
                                        
Thread.currentThread().setContextClassLoader(oldClassLoader);
                                }
                        }
@@ -1334,6 +1350,8 @@
                        try {
                                final ClassLoader cl = 
sipContext.getSipContextClassLoader();
                                
Thread.currentThread().setContextClassLoader(cl);
+                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                               sipContext.bindThreadBindingListener();

                                final SipErrorEvent sipErrorEvent = new 
SipErrorEvent(
                                                
(SipServletRequest)sipServletMessage,
@@ -1348,6 +1366,8 @@
                                        }
                                }
                        } finally {
+                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                               sipContext.unbindThreadBindingListener();
                                
Thread.currentThread().setContextClassLoader(oldClassLoader);
                        }
                        final Dialog dialog = 
sipSession.getSessionCreatingDialog();
@@ -1394,7 +1414,9 @@
                        try {
                                final ClassLoader cl = 
sipContext.getSipContextClassLoader();
                                
Thread.currentThread().setContextClassLoader(cl);
-
+                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                               sipContext.bindThreadBindingListener();
+
                                final SipErrorEvent sipErrorEvent = new 
SipErrorEvent(
                                                
(SipServletRequest)sipServletMessage,
                                                lastInfoResponse);
@@ -1407,6 +1429,8 @@
                                        }
                                }
                        } finally {
+                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                               sipContext.unbindThreadBindingListener();
                                
Thread.currentThread().setContextClassLoader(oldClassLoader);
                        }
                }
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionAsyncTask.java Thu Sep 8 02:18:19 2011 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionAsyncTask.java Sun Jul 22 12:13:52 2012
@@ -63,6 +63,8 @@
                                try {
                                        ClassLoader cl = 
sipContext.getSipContextClassLoader();
                                        
Thread.currentThread().setContextClassLoader(cl);
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       sipContext.bindThreadBindingListener();
                                        
sipContext.enterSipApp(sipApplicationSession, null, false);
                                        batchStarted = 
sipContext.enterSipAppHa(true);

@@ -72,6 +74,8 @@
                                } finally {
                                        sipContext.exitSipAppHa(null, null, 
batchStarted);
                                        
sipContext.exitSipApp(sipApplicationSession, null);
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       
sipContext.unbindThreadBindingListener();
                                        
Thread.currentThread().setContextClassLoader(oldClassLoader);
                                }
                        } else {
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java Thu Oct 20 12:24:44 2011 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java Sun Jul 22 12:13:52 2012
@@ -182,6 +182,8 @@
                if(listeners.size() > 0) {
ClassLoader oldLoader = java.lang.Thread.currentThread().getContextClassLoader(); java.lang.Thread.currentThread().setContextClassLoader(sipContext.getSipContextClassLoader());
+                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                       sipContext.bindThreadBindingListener();
SipApplicationSessionEvent event = new SipApplicationSessionEvent(this.getFacade());
                        if(logger.isDebugEnabled()) {
logger.debug("notifying sip application session listeners of context " +
@@ -207,6 +209,8 @@
                                        logger.error("SipApplicationSessionListener 
threw exception", t);
                                }
                        }
+                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                       sipContext.unbindThreadBindingListener();
                        
java.lang.Thread.currentThread().setContextClassLoader(oldLoader);
                }
        }
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java Thu Sep 8 02:18:19 2011 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java Sun Jul 22 12:13:52 2012
@@ -66,6 +66,8 @@
                                try {
                                        ClassLoader cl = 
sipContext.getSipContextClassLoader();
                                        
Thread.currentThread().setContextClassLoader(cl);
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       sipContext.bindThreadBindingListener();
                                        
sipContext.enterSipApp(sipApplicationSession, sipSession, false);
                                        batchStarted = 
sipContext.enterSipAppHa(true);

@@ -75,6 +77,8 @@
                                } finally {
                                        sipContext.exitSipAppHa(null, null, 
batchStarted);
                                        
sipContext.exitSipApp(sipApplicationSession, sipSession);
+                                       // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                                       
sipContext.unbindThreadBindingListener();
                                        
Thread.currentThread().setContextClassLoader(oldClassLoader);
                                }
                        } else {
=======================================
--- /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java Thu Oct 20 11:39:12 2011 +++ /sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java Sun Jul 22 12:13:52 2012
@@ -330,7 +330,9 @@
                                                        sipSessionEventType);
                                }
ClassLoader oldLoader = java.lang.Thread.currentThread().getContextClassLoader(); - java.lang.Thread.currentThread().setContextClassLoader(sipContext.getSipContextClassLoader()); + java.lang.Thread.currentThread().setContextClassLoader(sipContext.getSipContextClassLoader());
+                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                               sipContext.bindThreadBindingListener();
SipSessionEvent sipSessionEvent = new SipSessionEvent(this.getFacade());
                                for (SipSessionListener sipSessionListener : 
sipSessionListeners) {
                                        try {
@@ -349,6 +351,8 @@
                                                logger.error("SipSessionListener 
threw exception", t);
                                        }
                                }
+                               // 
http://code.google.com/p/sipservlets/issues/detail?id=135
+                               sipContext.unbindThreadBindingListener();
                                
java.lang.Thread.currentThread().setContextClassLoader(oldLoader);
                        }
                }

Reply via email to