Revision: 15673
Author: [email protected]
Date: Wed Dec  8 05:07:00 2010
Log: Fixes Issue 2193
http://code.google.com/p/mobicents/source/detail?r=15673

Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/MobicentsSipApplicationSession.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/DefaultSasTimerTask.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/StandardSasTimerTask.java /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/MobicentsSipApplicationSessionFacade.java /trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java /trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Tue Dec 7 08:47:44 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java Wed Dec 8 05:07:00 2010
@@ -953,7 +953,7 @@
                                                }
                                        }
                                        if(sipApplicationSession != null) {
-                                               
sipContext.enterSipApp(sipApplicationSession, sipSessionImpl);
+                                               
sipContext.enterSipApp(sipApplicationSession, null);
                                                try {
                                                        
if(logger.isDebugEnabled()) {
logger.debug("sip app session " + sipApplicationSession.getKey() + " is valid ? :" + sipApplicationSession.isValidInternal());
@@ -965,7 +965,7 @@
                                                                
sipApplicationSession.tryToInvalidate();
                                                        }
                                                } finally {
-                                                       
sipContext.exitSipApp(sipApplicationSession, sipSessionImpl);
+                                                       
sipContext.exitSipApp(sipApplicationSession, null);
                                                }
                                        }

=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/MobicentsSipApplicationSession.java Wed Nov 17 05:14:51 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/MobicentsSipApplicationSession.java Wed Dec 8 05:07:00 2010
@@ -86,4 +86,6 @@
        long getSipApplicationSessionTimeout();

        Set<MobicentsSipSession> getSipSessions();
-}
+
+       void invalidate(boolean bypassCheck);
+}
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java Thu Dec 2 13:36:06 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java Wed Dec 8 05:07:00 2010
@@ -561,7 +561,20 @@
                //doing the invalidation
                for(MobicentsSipSession session: getSipSessions()) {
                        if(session.isValidInternal()) {
-                               session.invalidate();
+                               boolean lockSession = false;
+ if(bypassCheck && sipContext.getConcurrencyControlMode() == ConcurrencyControlMode.SipSession) {
+                                       lockSession = true;
+                               }
+                               try {
+                                       if(lockSession) {
+                                               sipContext.enterSipApp(this, 
session);
+                                       }
+                                       session.invalidate();
+                               } finally {
+                                       if(lockSession) {
+                                               sipContext.exitSipApp(this, 
session);
+                                       }
+                               }
                        }
                }
                for(HttpSession session: getHttpSessions()) {
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java Wed Aug 18 09:15:50 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java Wed Dec 8 05:07:00 2010
@@ -63,7 +63,7 @@
                                try {
                                        ClassLoader cl = 
sipContext.getLoader().getClassLoader();
                                        
Thread.currentThread().setContextClassLoader(cl);
-                                       
sipContext.enterSipApp(sipApplicationSession, null);
+                                       
sipContext.enterSipApp(sipApplicationSession, sipSession);
                                        sipContext.enterSipAppHa(true);

                                        work.doAsynchronousWork(sipSession);
@@ -71,7 +71,7 @@
logger.error("An unexpected exception happened in the SipSessionAsynchronousWork callback on sip session " + key, t);
                                } finally {
                                        sipContext.exitSipAppHa(null, null);
-                                       
sipContext.exitSipApp(sipApplicationSession, null);
+                                       
sipContext.exitSipApp(sipApplicationSession, sipSession);
                                        
Thread.currentThread().setContextClassLoader(oldClassLoader);
                                }
                        } else {
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/DefaultSasTimerTask.java Sat Sep 18 06:07:20 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/DefaultSasTimerTask.java Wed Dec 8 05:07:00 2010
@@ -87,7 +87,7 @@
                        if(getDelay() <= 0) {
                                getSipApplicationSession().setExpired(true);
                                
if(getSipApplicationSession().isValidInternal()) {
-                                       getSipApplicationSession().invalidate();
+                                       
getSipApplicationSession().invalidate(true);
                                }
                        } else {
// Issue 1773 : http://code.google.com/p/mobicents/issues/detail?id=1773
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/StandardSasTimerTask.java Thu Sep 16 21:06:37 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/StandardSasTimerTask.java Wed Dec 8 05:07:00 2010
@@ -86,7 +86,7 @@

                                getSipApplicationSession().setExpired(true);
                                
if(getSipApplicationSession().isValidInternal()) {
-                                       getSipApplicationSession().invalidate();
+                                       
getSipApplicationSession().invalidate(true);
                                }
                        } else {
// Issue 1773 : http://code.google.com/p/mobicents/issues/detail?id=1773
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/MobicentsSipApplicationSessionFacade.java Wed Nov 17 05:14:51 2010 +++ /trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/MobicentsSipApplicationSessionFacade.java Wed Dec 8 05:07:00 2010
@@ -329,5 +329,9 @@
        public long getSipApplicationSessionTimeout() {
                return sipApplicationSession.getSipApplicationSessionTimeout();
        }
+
+       public void invalidate(boolean bypassCheck) {
+               sipApplicationSession.invalidate(true);
+       }

 }
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Tue Oct 12 11:50:44 2010 +++ /trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Dec 8 05:07:00 2010
@@ -970,30 +970,7 @@
                                                                        " sipSession=" + 
sipSession + " semaphore=" + semaphore);
                                                }
                                        }
-                               } else if (sipApplicationSession != null) {
-                                       // if the sip session is null but not 
the sip app session,
-                                       // we try to acquire the semaphore of 
all the underlying sip sessions
-                                       // but this could lead to deadlocks in 
certain cases, if it occurs
- // it is recommended to upgrade to SipApplicationSession concurrency control mode - Iterator<MobicentsSipSession> sipSessionIt = (Iterator<MobicentsSipSession>)
-                                               
sipApplicationSession.getSipSessions().iterator();
-                                       while (sipSessionIt.hasNext()) {
-                                               MobicentsSipSession 
childSipSession = sipSessionIt
-                                                               .next();
-                                               final Semaphore semaphore = 
childSipSession.getSemaphore();
-                                               if(semaphore != null) {
-                                                       
if(logger.isDebugEnabled()) {
- logger.debug("Child SipSession: Before semaphore acquire for sipApplicationSession=" + sipApplicationSession +
-                                                                               " 
sipSession=" + sipSession + " semaphore=" + semaphore);
-                                                       }
-                                                       
semaphore.acquireUninterruptibly();
-                                                       
if(logger.isDebugEnabled()) {
- logger.debug("Child SipSession: After semaphore acquire for sipApplicationSession=" + sipApplicationSession +
-                                                                               " 
sipSession=" + sipSession + " semaphore=" + semaphore);
-                                                       }
-                                               }
-                                       }
-                               }
+                               }
                                break;
                        case SipApplicationSession:
                                if(sipApplicationSession != null) {
@@ -1014,30 +991,7 @@
                        case None:
                                break;
                }
-       }
-
-// public void enterSipAppHa(SipServletRequestImpl request, SipServletResponseImpl response, boolean startCacheActivity, boolean bindSessions) {
-//             if(getDistributable() && hasDistributableManager) {
-//                     startBatchTransaction();
-//                     if(bindSessions) {
-// ConvergedSessionReplicationContext.enterSipappAndBindSessions(request, response, getSipManager(), startCacheActivity);
-//                     } else {
-// ConvergedSessionReplicationContext.enterSipapp(request, response, startCacheActivity);
-//                     }
-//             }
-//     }
-
-// public void enterSipAppHa(MobicentsSipApplicationSession sipApplicationSession, boolean startCacheActivity, boolean bindSessions) {
-//             if(getDistributable() && hasDistributableManager) {
-//                     startBatchTransaction();
-//                     if(bindSessions) {
-// ConvergedSessionReplicationContext.enterSipappAndBindSessions(sipApplicationSession,
-//                             getSipManager(), startCacheActivity);
-//                     } else {
-// ConvergedSessionReplicationContext.enterSipapp(null, null, startCacheActivity);
-//                     }
-//             }
-//     }
+       }

     public void enterSipAppHa(boolean startCacheActivity) {
                if(getDistributable() && hasDistributableManager) {
@@ -1063,22 +1017,7 @@
                                                                        " sipSession=" + 
sipSession + " semaphore=" + semaphore);
                                                }
                                        }
-                               } else if (sipApplicationSession != null) {
- Iterator<MobicentsSipSession> sipSessionIt = (Iterator<MobicentsSipSession>)
-                                               
sipApplicationSession.getSipSessions().iterator();
-                                       while (sipSessionIt.hasNext()) {
-                                               MobicentsSipSession 
childSipSession = sipSessionIt
-                                                               .next();
-                                               final Semaphore semaphore = 
childSipSession.getSemaphore();
-                                               if(semaphore != null) {
-                                                       semaphore.release();
-                                                       
if(logger.isDebugEnabled()) {
- logger.debug("Child SipSession: Semaphore released for sipApplicationSession=" + sipApplicationSession +
-                                                                               " 
sipSession=" + sipSession + " semaphore=" + semaphore);
-                                                       }
-                                               }
-                                       }
-                               }
+                               }
                                break;
                        case SipApplicationSession:
if(sipApplicationSession != null && sipApplicationSession.getSemaphore() != null) {
=======================================
--- /trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Tue Oct 12 11:50:44 2010 +++ /trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java Wed Dec 8 05:07:00 2010
@@ -1171,30 +1171,7 @@
                                                                        " sipSession=" + 
sipSession + " semaphore=" + semaphore);
                                                }
                                        }
-                               } else if (sipApplicationSession != null) {
-                                       // if the sip session is null but not 
the sip app session,
-                                       // we try to acquire the semaphore of 
all the underlying sip sessions
-                                       // but this could lead to deadlocks in 
certain cases, if it occurs
- // it is recommended to upgrade to SipApplicationSession concurrency control mode - Iterator<MobicentsSipSession> sipSessionIt = (Iterator<MobicentsSipSession>)
-                                               
sipApplicationSession.getSipSessions().iterator();
-                                       while (sipSessionIt.hasNext()) {
-                                               MobicentsSipSession 
childSipSession = sipSessionIt
-                                                               .next();
-                                               final Semaphore semaphore = 
childSipSession.getSemaphore();
-                                               if(semaphore != null) {
-                                                       
if(logger.isDebugEnabled()) {
- logger.debug("Child SipSession: Before semaphore acquire for sipApplicationSession=" + sipApplicationSession +
-                                                                               " 
sipSession=" + sipSession + " semaphore=" + semaphore);
-                                                       }
-                                                       
semaphore.acquireUninterruptibly();
-                                                       
if(logger.isDebugEnabled()) {
- logger.debug("Child SipSession: After semaphore acquire for sipApplicationSession=" + sipApplicationSession +
-                                                                               " 
sipSession=" + sipSession + " semaphore=" + semaphore);
-                                                       }
-                                               }
-                                       }
-                               }
+                               }
                                break;
                        case SipApplicationSession:
                                if(sipApplicationSession != null) {
@@ -1229,22 +1206,7 @@
                                                                        " sipSession=" + 
sipSession + " semaphore=" + semaphore);
                                                }
                                        }
-                               } else if (sipApplicationSession != null) {
- Iterator<MobicentsSipSession> sipSessionIt = (Iterator<MobicentsSipSession>)
-                                               
sipApplicationSession.getSipSessions().iterator();
-                                       while (sipSessionIt.hasNext()) {
-                                               MobicentsSipSession 
childSipSession = sipSessionIt
-                                                               .next();
-                                               final Semaphore semaphore = 
childSipSession.getSemaphore();
-                                               if(semaphore != null) {
-                                                       semaphore.release();
-                                                       
if(logger.isDebugEnabled()) {
- logger.debug("Child SipSession: Semaphore released for sipApplicationSession=" + sipApplicationSession +
-                                                                               " 
sipSession=" + sipSession + " semaphore=" + semaphore);
-                                                       }
-                                               }
-                                       }
-                               }
+                               }
                                break;
                        case SipApplicationSession:
if(sipApplicationSession != null && sipApplicationSession.getSemaphore() != null) {

Reply via email to