Fix For Issue 989 : Race condition in B2BUA when responses are delivered too fast (http://code.google.com/p/mobicents/issues/detail?id=989)

git-svn-id: https://mobicents.googlecode.com/svn/trunk/servers/sip-servlets@7886 bf0df8d0-2c1f-0410-b170-bd30377b63dc

Author: jean.deruelle@gmail.com

jopr-plugin-as-5/src/main/resources/META-INF/rhq-plugin.xml

@@ -771,6 +771,7 @@
         		<c:simple-property name="concurrencyControlMode" defaultValue="SipSession">
         			<c:property-options>
 	                   <c:option value="None"/>
+	                   <c:option value="Transaction"/>
 	                   <c:option value="SipSession" default="true"/>
 	                   <c:option value="SipApplicationSession"/>	                   
 	                </c:property-options>        		

sip-servlets-annotations/src/main/java/org/mobicents/servlet/sip/annotation/ConcurrencyControlMode.java

@@ -22,6 +22,7 @@
  *
  */
 public enum ConcurrencyControlMode {
+	Transaction,
 	SipSession,
 	SipApplicationSession,
 	None

sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/InitialRequestDispatcher.java

@@ -56,6 +56,7 @@
 import org.mobicents.servlet.sip.address.RFC2396UrlDecoder;
 import org.mobicents.servlet.sip.address.SipURIImpl;
 import org.mobicents.servlet.sip.address.TelURLImpl;
+import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
 import org.mobicents.servlet.sip.core.SipSessionRoutingType;
 import org.mobicents.servlet.sip.core.session.MobicentsSipApplicationSession;
 import org.mobicents.servlet.sip.core.session.MobicentsSipSession;
@@ -392,7 +393,7 @@ private void dispatchInsideContainer(final SipProvider sipProvider, final SipApp
 
 		final InitialDispatchTask dispatchTask = new InitialDispatchTask(sipServletRequest, sipProvider);
 		// if the flag is set we bypass the executor 
-		if(sipApplicationDispatcher.isBypassRequestExecutor()) {
+		if(sipApplicationDispatcher.isBypassRequestExecutor() || ConcurrencyControlMode.Transaction.equals((sipContext.getConcurrencyControlMode()))) {
 			dispatchTask.dispatchAndHandleExceptions();
 		} else {
 			getConcurrencyModelExecutorService(sipContext, sipServletRequest).execute(dispatchTask);

sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/ResponseDispatcher.java

@@ -35,6 +35,7 @@
 
 import org.apache.log4j.Logger;
 import org.mobicents.servlet.sip.JainSipUtils;
+import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
 import org.mobicents.servlet.sip.core.session.MobicentsSipSession;
 import org.mobicents.servlet.sip.core.session.SessionManagerUtil;
 import org.mobicents.servlet.sip.core.session.SipManager;
@@ -276,7 +277,7 @@ public void dispatch() throws DispatcherException {
 				}
 			};
 			// if the flag is set we bypass the executor 
-			if(sipApplicationDispatcher.isBypassResponseExecutor()) {
+			if(sipApplicationDispatcher.isBypassResponseExecutor() || ConcurrencyControlMode.Transaction.equals((sipContext.getConcurrencyControlMode()))) {
 				dispatchTask.dispatchAndHandleExceptions();
 			} else {
 				getConcurrencyModelExecutorService(sipContext, sipServletMessage).execute(dispatchTask);				

sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/SubsequentRequestDispatcher.java

@@ -38,6 +38,7 @@
 
 import org.apache.log4j.Logger;
 import org.mobicents.servlet.sip.JainSipUtils;
+import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
 import org.mobicents.servlet.sip.core.ApplicationRoutingHeaderComposer;
 import org.mobicents.servlet.sip.core.session.MobicentsSipApplicationSession;
 import org.mobicents.servlet.sip.core.session.MobicentsSipSession;
@@ -257,7 +258,7 @@ public void dispatchMessage(final SipProvider sipProvider, SipServletMessageImpl
 
 		final SubsequentDispatchTask dispatchTask = new SubsequentDispatchTask(sipServletRequest, sipProvider);
 		// if the flag is set we bypass the executor 
-		if(sipApplicationDispatcher.isBypassRequestExecutor()) {
+		if(sipApplicationDispatcher.isBypassRequestExecutor() || ConcurrencyControlMode.Transaction.equals((sipContext.getConcurrencyControlMode()))) {
 			dispatchTask.dispatchAndHandleExceptions();
 		} else {
 			getConcurrencyModelExecutorService(sipContext, sipServletMessage).execute(dispatchTask);

sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java

@@ -175,7 +175,7 @@ protected Map<String,Object> getAttributeMap() {
 
 	protected SipApplicationSessionImpl(SipApplicationSessionKey key, SipContext sipContext) {
 		sipSessions = new ConcurrentHashMap<String,SipSessionKey>();
-		if(sipContext != null && !ConcurrencyControlMode.None.equals(sipContext.getConcurrencyControlMode())) {
+		if(sipContext != null && ConcurrencyControlMode.SipApplicationSession.equals(sipContext.getConcurrencyControlMode())) {
 			semaphore = new Semaphore(1);
 		}
 		this.key = key;

sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java

@@ -252,7 +252,7 @@ protected SipSessionImpl (SipSessionKey key, SipFactoryImpl sipFactoryImpl, Mobi
 		this.state = State.INITIAL;
 		this.isValid = true;		
 		this.ongoingTransactions = new CopyOnWriteArraySet<Transaction>();
-		if(mobicentsSipApplicationSession.getSipContext() != null && !ConcurrencyControlMode.None.equals(mobicentsSipApplicationSession.getSipContext().getConcurrencyControlMode())) {
+		if(mobicentsSipApplicationSession.getSipContext() != null && ConcurrencyControlMode.SipSession.equals(mobicentsSipApplicationSession.getSipContext().getConcurrencyControlMode())) {
 			semaphore = new Semaphore(1);		
 		}
 		// the sip context can be null if the AR returned an application that was not deployed

sip-servlets-management/src/main/java/org/mobicents/servlet/management/client/configuration/ConfiguationPage.java

@@ -20,6 +20,7 @@
 public class ConfiguationPage extends Panel {
 	private static Object[][] concurrencyControlModes = new Object[][]{  
 		new Object[]{"None"},  
+		new Object[]{"Transaction"},
 		new Object[]{"SipSession"},
 		new Object[]{"SipApplicationSession"}
 	};