Author: jean.deruelle
Date: Fri Mar 13 08:36:40 2009
New Revision: 5057
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedSessionDelegate.java
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedStandardSession.java
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SessionManagerUtil.java
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionKey.java
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipStandardManager.java
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.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/message/SipServletResponseImpl.java
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java
trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedAttributeBasedClusteredSession.java
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedFieldBasedClusteredSession.java
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedSessionBasedClusteredSession.java
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheSipManager.java
Log:
Fix for Issue 614 : making the sip app session key a random uuid instead of
using the callid to allow an app session to create calls with different
call id to accomodate VOiP providers
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
Fri Mar 13 08:36:40 2009
@@ -163,14 +163,16 @@
//or an invalid session id as a failure to obtain a key from the
application.
//It is recommended that the container create a new
SipApplicationSession for the incoming request in such a case.
// throw new IllegalStateException("SipApplicationKey annotated method
shoud not return null");
- id =
((CallIdHeader)request.getHeader((CallIdHeader.NAME))).getCallId();
+//not needed anymore since the sipappsesionkey is not a callid anymore but
a rnadom uuid
+// id =
((CallIdHeader)request.getHeader((CallIdHeader.NAME))).getCallId();
}
if(logger.isDebugEnabled()) {
logger.debug("For request target to application " +
sipContext.getApplicationName() +
", following annotated method " + appKeyMethod + " generated the
application key : " + id);
}
} else {
- id =
((CallIdHeader)request.getHeader((CallIdHeader.NAME))).getCallId();
+////not needed anymore since the sipappsesionkey is not a callid anymore
but a rnadom uuid
+// id =
((CallIdHeader)request.getHeader((CallIdHeader.NAME))).getCallId();
}
SipApplicationSessionKey sipApplicationSessionKey =
SessionManagerUtil.getSipApplicationSessionKey(
applicationName,
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedSessionDelegate.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedSessionDelegate.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedSessionDelegate.java
Fri Mar 13 08:36:40 2009
@@ -37,7 +37,7 @@
*/
public class ConvergedSessionDelegate {
- protected SipNetworkInterfaceManager sipNetworkInterfaceManager;
+// protected SipNetworkInterfaceManager sipNetworkInterfaceManager;
protected SipManager sipManager;
protected HttpSession httpSession;
@@ -45,8 +45,8 @@
*
* @param sessionManager
*/
- public ConvergedSessionDelegate(SipManager manager,
SipNetworkInterfaceManager sipNetworkInterfaceManager, HttpSession
httpSession) {
- this.sipNetworkInterfaceManager = sipNetworkInterfaceManager;
+ public ConvergedSessionDelegate(SipManager manager, HttpSession
httpSession) {
+// this.sipNetworkInterfaceManager = sipNetworkInterfaceManager;
this.sipManager = manager;
this.httpSession = httpSession;
}
@@ -139,12 +139,14 @@
if(sipApplicationSession == null && create) {
//however if no application session is associated it is
created,
//associated with the HttpSession and returned.
- ExtendedListeningPoint listeningPoint =
-
sipNetworkInterfaceManager.getExtendedListeningPoints().next();
+ //not needed anymore since the sipappsesionkey is not a callid anymore
but a rnadom uuid
+// ExtendedListeningPoint listeningPoint =
+//
sipNetworkInterfaceManager.getExtendedListeningPoints().next();
+//
SipApplicationSessionKey sipApplicationSessionKey =
SessionManagerUtil.getSipApplicationSessionKey(
((SipContext)sipManager.getContainer()).getApplicationName(),
-
listeningPoint.getSipProvider().getNewCallId().getCallId(),
+ null,
false);
sipApplicationSession =
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedStandardSession.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedStandardSession.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/ConvergedStandardSession.java
Fri Mar 13 08:36:40 2009
@@ -48,9 +48,9 @@
*
* @param sessionManager
*/
- public ConvergedStandardSession(SipManager manager,
SipNetworkInterfaceManager sipNetworkInterfaceManager) {
+ public ConvergedStandardSession(SipManager manager) {
super(manager);
- convergedSessionDelegate = new ConvergedSessionDelegate(manager,
sipNetworkInterfaceManager, this);
+ convergedSessionDelegate = new
ConvergedSessionDelegate(manager, this);
}
@Override
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SessionManagerUtil.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SessionManagerUtil.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SessionManagerUtil.java
Fri Mar 13 08:36:40 2009
@@ -98,9 +98,9 @@
if(applicationName == null) {
throw new NullPointerException("the application name cannot be null for
sip application session key creation");
}
- if(id == null) {
- throw new NullPointerException("the callId cannot be null for sip
application session key creation");
- }
+// if(id == null) {
+// throw new NullPointerException("the callId cannot be null for sip
application session key creation");
+// }
return new SipApplicationSessionKey(
id,
applicationName,
@@ -130,10 +130,10 @@
throw new ParseException("The right parenthesis could not be found in
the following key " + sipApplicationKey, 0);
}
- String callId = sipApplicationKey.substring(indexOfLeftParenthesis + 1,
indexOfComma);
+ String uuid = sipApplicationKey.substring(indexOfLeftParenthesis + 1,
indexOfComma);
String applicationName = sipApplicationKey.substring(indexOfComma + 1,
indexOfRightParenthesis);
- return getSipApplicationSessionKey(applicationName, callId,
false);
+ return getSipApplicationSessionKey(applicationName, uuid,
false);
}
/**
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionKey.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionKey.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionKey.java
Fri Mar 13 08:36:40 2009
@@ -17,18 +17,20 @@
package org.mobicents.servlet.sip.core.session;
import java.io.Serializable;
+import java.util.UUID;
/**
* <p>
* Class representing the key (which will also be its id) for a sip
application session.<br/>
- * It is composed of the Call-Id and the application Name.
+ * It is composed of a random UUID and the application Name.
* </p>
*
* @author <A HREF="mailto:[email protected]";>Jean Deruelle</A>
*
*/
public class SipApplicationSessionKey implements Serializable {
- String id;
+ String uuid;
+// String id;
String applicationName;
boolean isAppGeneratedKey;
private String toString;
@@ -39,12 +41,17 @@
*/
public SipApplicationSessionKey(String id, String applicationName,
boolean isAppGeneratedKey) {
super();
- this.id = id;
+ if(id == null) {
+ this.uuid = "" + System.nanoTime();
+ } else {
+ this.uuid = id;
+ }
+// this.id = id;
this.applicationName = applicationName;
this.isAppGeneratedKey = isAppGeneratedKey;
StringBuffer value = new StringBuffer();
value = value.append("(");
- value = value.append(id);
+ value = value.append(uuid);
value = value.append(",");
value = value.append(applicationName);
value = value.append(")");
@@ -54,7 +61,7 @@
* @return the Id
*/
public String getId() {
- return id;
+ return uuid;
}
/**
* @return the applicationName
@@ -77,7 +84,7 @@
int result = 1;
result = prime * result
+ ((applicationName == null) ? 0 :
applicationName.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((uuid == null) ? 0 :
uuid.hashCode());
return result;
}
/* (non-Javadoc)
@@ -97,10 +104,10 @@
return false;
} else if (!applicationName.equals(other.applicationName))
return false;
- if (id == null) {
- if (other.id != null)
+ if (uuid == null) {
+ if (other.uuid != null)
return false;
- } else if (!id.equals(other.id))
+ } else if (!uuid.equals(other.uuid))
return false;
return true;
}
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipStandardManager.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipStandardManager.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipStandardManager.java
Fri Mar 13 08:36:40 2009
@@ -91,7 +91,7 @@
protected StandardSession getNewSession() {
//return a converged session only if it is managing a sipcontext
if(container instanceof SipContext) {
- return new ConvergedStandardSession(this,
sipManagerDelegate.getSipFactoryImpl().getSipNetworkInterfaceManager());
+ return new ConvergedStandardSession(this);
} else {
return super.getNewSession();
}
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/B2buaHelperImpl.java
Fri Mar 13 08:36:40 2009
@@ -172,6 +172,7 @@
ApplicationRoutingHeaderComposer stack = new
ApplicationRoutingHeaderComposer(
dispatcher.getMdToApplicationName(),
oldFromHeader.getTag());
stack.setApplicationName(originalSession.getKey().getApplicationName());
+
stack.setAppGeneratedApplicationSessionId(appSession.getKey().getId());
newFromHeader.setTag(stack.toString());
SipSessionKey key =
SessionManagerUtil.getSipSessionKey(originalSession.getKey().getApplicationName(),
newRequest, false);
@@ -524,6 +525,7 @@
ApplicationRoutingHeaderComposer stack = new
ApplicationRoutingHeaderComposer(
dispatcher.getMdToApplicationName(),
oldFromHeader.getTag());
stack.setApplicationName(originalSession.getKey().getApplicationName());
+
stack.setAppGeneratedApplicationSessionId(originalAppSession.getKey().getId());
newFromHeader.setTag(stack.toString());
SipSessionKey key =
SessionManagerUtil.getSipSessionKey(originalSession.getKey().getApplicationName(),
newRequest, false);
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipFactoryImpl.java
Fri Mar 13 08:36:40 2009
@@ -174,10 +174,10 @@
if (logger.isDebugEnabled()) {
logger.debug("Creating new application session for sip context "+
sipContext.getApplicationName());
}
+ //call id not needed anymore since the sipappsessionkey is not a callid
anymore but a random uuid
SipApplicationSessionKey sipApplicationSessionKey =
SessionManagerUtil.getSipApplicationSessionKey(
sipContext.getApplicationName(),
-
sipApplicationDispatcher.getSipNetworkInterfaceManager().getExtendedListeningPoints().next()
-
.getSipProvider().getNewCallId().getCallId(),
+ null,
false);
MobicentsSipApplicationSession sipApplicationSession =
((SipManager)sipContext.getManager()).getSipApplicationSession(
sipApplicationSessionKey, true);
@@ -416,13 +416,13 @@
cseqHeader =
SipFactories.headerFactory.createCSeqHeader(1L, method);
// Fix provided by Hauke D. Issue 411
SipApplicationSessionKey sipApplicationSessionKey =
mobicentsSipApplicationSession.getKey();
- if(sipApplicationSessionKey.isAppGeneratedKey()) {
+// if(sipApplicationSessionKey.isAppGeneratedKey()) {
callIdHeader =
SipFactories.headerFactory.createCallIdHeader(
getSipNetworkInterfaceManager().getExtendedListeningPoints().next().getSipProvider().getNewCallId().getCallId());
- } else {
- callIdHeader =
SipFactories.headerFactory.createCallIdHeader(
-
sipApplicationSessionKey.getId());
- }
+// } else {
+// callIdHeader =
SipFactories.headerFactory.createCallIdHeader(
+//
sipApplicationSessionKey.getId());
+// }
maxForwardsHeader = SipFactories.headerFactory
.createMaxForwardsHeader(JainSipUtils.MAX_FORWARD_HEADER_VALUE);
URIImpl requestURI =
(URIImpl)to.getURI().clone();
@@ -490,11 +490,11 @@
SipApplicationDispatcher dispatcher =
mobicentsSipApplicationSession.getSipContext().getSipApplicationDispatcher();
ApplicationRoutingHeaderComposer stack = new
ApplicationRoutingHeaderComposer(
- dispatcher.getMdToApplicationName());
+ dispatcher.getMdToApplicationName());
stack.setApplicationName(sipAppSession.getApplicationName());
- if(sipApplicationSessionKey.isAppGeneratedKey()) {
+// if(sipApplicationSessionKey.isAppGeneratedKey()) {
stack.setAppGeneratedApplicationSessionId(sipApplicationSessionKey.getId());
- }
+// }
fromHeader.setTag(stack.toString());
SipSessionKey key = SessionManagerUtil.getSipSessionKey(
Modified:
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/message/SipServletMessageImpl.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletMessageImpl.java
Fri Mar 13 08:36:40 2009
@@ -669,9 +669,10 @@
&& this.session.getApplicationSession() !=
null) {
return this.session.getApplicationSession();
} else if (create) {
+ //call id not needed anymore since the sipappsessionkey is not a callid
anymore but a random uuid
SipApplicationSessionKey key =
SessionManagerUtil.getSipApplicationSessionKey(
currentApplicationName,
-
((CallIdHeader)message.getHeader((CallIdHeader.NAME))).getCallId(),
+ null,
false);
if(this.session == null) {
if(logger.isDebugEnabled()) {
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletResponseImpl.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletResponseImpl.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletResponseImpl.java
Fri Mar 13 08:36:40 2009
@@ -409,9 +409,9 @@
);
sipURI.setParameter(MessageDispatcher.RR_PARAM_APPLICATION_NAME,
session.getKey().getApplicationName());
sipURI.setParameter(MessageDispatcher.FINAL_RESPONSE,
"true");
-
if(session.getSipApplicationSession().getKey().isAppGeneratedKey()) {
- sipURI.setParameter(MessageDispatcher.GENERATED_APP_KEY,
RFC2396UrlDecoder.encode(session.getSipApplicationSession().getKey().getId()));
- }
+//
if(session.getSipApplicationSession().getKey().isAppGeneratedKey()) {
+ sipURI.setParameter(MessageDispatcher.GENERATED_APP_KEY,
RFC2396UrlDecoder.encode(session.getSipApplicationSession().getKey().getId()));
+// }
sipURI.setLrParam();
javax.sip.address.Address recordRouteAddress =
SipFactories.addressFactory.createAddress(sipURI);
Modified:
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyUtils.java
Fri Mar 13 08:36:40 2009
@@ -34,6 +34,7 @@
import org.apache.commons.logging.LogFactory;
import org.mobicents.servlet.sip.JainSipUtils;
import org.mobicents.servlet.sip.SipFactories;
+import org.mobicents.servlet.sip.address.RFC2396UrlDecoder;
import org.mobicents.servlet.sip.address.SipURIImpl;
import org.mobicents.servlet.sip.address.URIImpl;
import org.mobicents.servlet.sip.core.dispatchers.MessageDispatcher;
@@ -148,6 +149,8 @@
originalRequest.getSipSession().getKey().getApplicationName());
rrURI.setParameter(MessageDispatcher.RR_PARAM_PROXY_APP,
"true");
+
rrURI.setParameter(MessageDispatcher.GENERATED_APP_KEY,
+
RFC2396UrlDecoder.encode(originalRequest.getSipSession().getSipApplicationSession().getKey().getId()));
rrURI.setLrParam();
Address rraddress = SipFactories.addressFactory
Modified:
trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-test-suite/testsuite/src/main/java/org/mobicents/servlet/sip/SipEmbedded.java
Fri Mar 13 08:36:40 2009
@@ -142,6 +142,7 @@
sipService.setSipApplicationDispatcherClassName(SipApplicationDispatcherImpl.class.getName());
//
sipService.setSipApplicationRouterClassName(DefaultApplicationRouter.class.getName());
sipService.setDarConfigurationFileLocation(darConfigurationFilePath);
+ sipService.setCongestionControlCheckingInterval(30000);
// Create an engine
SipStandardEngine engine = new SipStandardEngine();
engine.setName(serverName);
Modified:
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedAttributeBasedClusteredSession.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedAttributeBasedClusteredSession.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedAttributeBasedClusteredSession.java
Fri Mar 13 08:36:40 2009
@@ -49,9 +49,9 @@
private ConvergedSessionDelegate convergedSessionDelegate = null;
- public ConvergedAttributeBasedClusteredSession(JBossCacheSipManager
manager, SipNetworkInterfaceManager sipNetworkInterfaceManager) {
+ public ConvergedAttributeBasedClusteredSession(JBossCacheSipManager
manager) {
super(manager);
- convergedSessionDelegate = new ConvergedSessionDelegate(manager,
sipNetworkInterfaceManager, this);
+ convergedSessionDelegate = new
ConvergedSessionDelegate(manager, this);
}
@Override
Modified:
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedFieldBasedClusteredSession.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedFieldBasedClusteredSession.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedFieldBasedClusteredSession.java
Fri Mar 13 08:36:40 2009
@@ -54,9 +54,9 @@
* @param manager
* @param sipNetworkInterfaceManager
*/
- public ConvergedFieldBasedClusteredSession(JBossCacheSipManager manager,
SipNetworkInterfaceManager sipNetworkInterfaceManager) {
+ public ConvergedFieldBasedClusteredSession(JBossCacheSipManager
manager) {
super(manager);
- convergedSessionDelegate = new ConvergedSessionDelegate(manager,
sipNetworkInterfaceManager, this);
+ convergedSessionDelegate = new
ConvergedSessionDelegate(manager, this);
}
@Override
Modified:
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedSessionBasedClusteredSession.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedSessionBasedClusteredSession.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/ConvergedSessionBasedClusteredSession.java
Fri Mar 13 08:36:40 2009
@@ -54,9 +54,9 @@
* @param manager
* @param sipNetworkInterfaceManager
*/
- public ConvergedSessionBasedClusteredSession(JBossCacheSipManager
manager, SipNetworkInterfaceManager sipNetworkInterfaceManager) {
+ public ConvergedSessionBasedClusteredSession(JBossCacheSipManager
manager) {
super(manager);
- convergedSessionDelegate = new ConvergedSessionDelegate(manager,
sipNetworkInterfaceManager, this);
+ convergedSessionDelegate = new
ConvergedSessionDelegate(manager, this);
}
@Override
Modified:
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheSipManager.java
==============================================================================
---
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheSipManager.java
(original)
+++
trunk/servers/sip-servlets/sip-servlets-tomcat-jboss4/src/main/java/org/jboss/web/tomcat/service/session/JBossCacheSipManager.java
Fri Mar 13 08:36:40 2009
@@ -648,8 +648,7 @@
+ msgEnd);
}
- ClusteredSession session =
createEmptyClusteredSession(sipManagerDelegate
-
.getSipFactoryImpl().getSipNetworkInterfaceManager());
+ ClusteredSession session = createEmptyClusteredSession();
session.setNew(true);
session.setCreationTime(System.currentTimeMillis());
@@ -1314,8 +1313,7 @@
// server, or we previously expired it and have since
gotten
// a replication message from another server
mustAdd = true;
- session = createEmptyClusteredSession(sipManagerDelegate
-
.getSipFactoryImpl().getSipNetworkInterfaceManager());
+ session = createEmptyClusteredSession();
}
synchronized (session) {
@@ -2687,20 +2685,17 @@
}
public Session createEmptySession() {
- return createEmptyClusteredSession(sipManagerDelegate
-
.getSipFactoryImpl().getSipNetworkInterfaceManager());
+ return createEmptyClusteredSession();
}
- private ClusteredSession createEmptyClusteredSession(
- SipNetworkInterfaceManager sipNetworkInterfaceManager) {
+ private ClusteredSession createEmptyClusteredSession() {
log_.debug("Creating an empty ClusteredSession");
ClusteredSession session = null;
switch (replicationGranularity_) {
case (WebMetaData.REPLICATION_GRANULARITY_ATTRIBUTE): {
if (super.container_ instanceof SipContext) {
- session = new
ConvergedAttributeBasedClusteredSession(this,
- sipNetworkInterfaceManager);
+ session = new
ConvergedAttributeBasedClusteredSession(this);
} else {
session = new
AttributeBasedClusteredSession(this);
}
@@ -2708,8 +2703,7 @@
}
case (WebMetaData.REPLICATION_GRANULARITY_FIELD): {
if (super.container_ instanceof SipContext) {
- session = new
ConvergedFieldBasedClusteredSession(this,
- sipNetworkInterfaceManager);
+ session = new
ConvergedFieldBasedClusteredSession(this);
} else {
session = new FieldBasedClusteredSession(this);
}
@@ -2717,8 +2711,7 @@
}
default:
if (super.container_ instanceof SipContext) {
- session = new
ConvergedSessionBasedClusteredSession(this,
- sipNetworkInterfaceManager);
+ session = new
ConvergedSessionBasedClusteredSession(this);
} else {
session = new
SessionBasedClusteredSession(this);
}
