6 new revisions:
Revision: a90a69bc5e80
Author: josemrecio <[email protected]>
Date: Sat Jul 21 10:32:01 2012
Log: Update Issue 135...
http://code.google.com/p/sipservlets/source/detail?r=a90a69bc5e80
Revision: 27cb70026004
Author: josemrecio <[email protected]>
Date: Sun Jul 22 12:13:52 2012
Log: Update Issue 135...
http://code.google.com/p/sipservlets/source/detail?r=27cb70026004
Revision: ad6ec9f52ffb
Author: josemrecio <[email protected]>
Date: Tue Jul 24 11:41:05 2012
Log: Update Issue 135...
http://code.google.com/p/sipservlets/source/detail?r=ad6ec9f52ffb
Revision: 003c7c14e2d3
Author: josemrecio <[email protected]>
Date: Tue Jul 24 11:44:47 2012
Log: Update Issue 135...
http://code.google.com/p/sipservlets/source/detail?r=003c7c14e2d3
Revision: 7eabb712118b
Author: josemrecio <[email protected]>
Date: Tue Jul 24 11:47:03 2012
Log: Update Issue 135...
http://code.google.com/p/sipservlets/source/detail?r=7eabb712118b
Revision: 872f4334b420
Author: Jean Deruelle <[email protected]>
Date: Fri Jul 27 05:50:42 2012
Log: Update Issue 135...
http://code.google.com/p/sipservlets/source/detail?r=872f4334b420
==============================================================================
Revision: a90a69bc5e80
Author: josemrecio <[email protected]>
Date: Sat Jul 21 10:32:01 2012
Log: Update Issue 135
Backport to TelScale Branch
Change in two areas:
1) Refactor SipJndiBindingProcessor so now JNDI bindings are setup as each
deployment unit is processed (previously only at ear level)
2) AS7 web container relies on a JNDI selector to properly setup a web
context specific JNDI context before any servlet invocation or interaction.
The selector is bound and unbound to the thread every time through
getThreadBindingListener() interface in catalina context.
This must also be performed for sip servlets. Two new methods has been
added to SipContext/SipStandardContext to allow sip container objects
access to that interface.
MessageDispatcher and ServletTimerImpl have been modified to bind and
unbind the jndi selector before any servlet interaction. This is done
everytime the class loader is also changed.
Next steps before closing the issue:
- In MessageDispatcher check whether routeSipMessageToRubyApp(),
makeAppSessionKey() and other methods also need jndi selector setup.
- Any other class that needs jndi selector setup?
- Currently the following jndi paths are setup:
java:sip/<app-name>/SipFactory
java:app/sip/<app-name>/SipFactory
java:comp/env/sip/<app-name>/SipFactory
these can probably be reduced to just comp/env
Additionally: AS7 will not setup jndi context before the context is totally
started.
(cherry picked from commit 66966cf43f87a88d91b144a0edae459a3715c08e)
http://code.google.com/p/sipservlets/source/detail?r=a90a69bc5e80
Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SIPWebContext.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipContext.java
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/ServletTimerImpl.java
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SIPWebContext.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SIPWebContext.java
Sat Jul 21 10:32:01 2012
@@ -68,15 +68,19 @@
super();
deploymentUnit = du;
sipJBossContextConfig = createContextConfig(this, deploymentUnit);
- // if this an ear deployment, attach this to the parent
deploymentUnit so it can be used to inject context resources (SipFactory,
etc.)
+ // attach context to top-level deploymentUnit so it can be used to
get context resources (SipFactory, etc.)
DeploymentUnit parentDu = deploymentUnit.getParent();
if (parentDu == null) {
- // this is a war only deployment
- return;
- }
- if (DeploymentTypeMarker.isType(DeploymentType.EAR, parentDu)) {
- if (logger.isDebugEnabled()) logger.debug("Attaching
SIPWebContext " + this + " to " + parentDu.getName());
- parentDu.putAttachment(SIPWebContext.ATTACHMENT, this);
+ // this is a war only deployment
+ if (logger.isDebugEnabled()) logger.debug("Attaching
SIPWebContext " + this + " to " + deploymentUnit.getName());
+ deploymentUnit.putAttachment(SIPWebContext.ATTACHMENT, this);
+ }
+ else if (DeploymentTypeMarker.isType(DeploymentType.EAR,
parentDu)) {
+ if (logger.isDebugEnabled()) logger.debug("Attaching
SIPWebContext " + this + " to " + parentDu.getName());
+ parentDu.putAttachment(SIPWebContext.ATTACHMENT, this);
+ }
+ else {
+ logger.error("Cowardly refusing to attach SIPWebContext " + this
+ " to " + deploymentUnit.getName() + " - This is probably a bug");
}
}
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
Sat Jul 21 10:32:01 2012
@@ -26,8 +26,7 @@
import org.jboss.as.ee.component.BindingConfiguration;
import org.jboss.as.ee.component.EEModuleDescription;
import
org.jboss.as.ee.component.deployers.EEResourceReferenceProcessorRegistry;
-import org.jboss.as.ee.structure.DeploymentType;
-import org.jboss.as.ee.structure.DeploymentTypeMarker;
+import org.jboss.as.server.deployment.AttachmentList;
import org.jboss.as.server.deployment.DeploymentPhaseContext;
import org.jboss.as.server.deployment.DeploymentUnit;
import org.jboss.as.server.deployment.DeploymentUnitProcessingException;
@@ -46,51 +45,61 @@
static final String SIP_SESSIONS_UTIL_JNDI = "SipSessionsUtil";
static final String SIP_TIMER_SERVICE_JNDI = "TimerService";
-
@Override
public void deploy(final DeploymentPhaseContext phaseContext) throws
DeploymentUnitProcessingException {
final DeploymentUnit deploymentUnit =
phaseContext.getDeploymentUnit();
- if (!DeploymentTypeMarker.isType(DeploymentType.EAR,
deploymentUnit)) {
- return;
- }
+ final DeploymentUnit parentDU = deploymentUnit.getParent();
+
// look for the sip application name to properly build the jndi
name
String sipApplicationName = null;
- for (final DeploymentUnit subDeployment :
deploymentUnit.getAttachment(org.jboss.as.server.deployment.Attachments.SUB_DEPLOYMENTS))
{
- SipMetaData sipMetaData =
subDeployment.getAttachment(SipMetaData.ATTACHMENT_KEY);
- if (sipMetaData != null) {
- sipApplicationName = sipMetaData.getApplicationName();
- break;
- }
+ SipMetaData sipMetaData =
deploymentUnit.getAttachment(SipMetaData.ATTACHMENT_KEY);
+ if (sipMetaData != null) {
+ sipApplicationName = sipMetaData.getApplicationName();
+ }
+ else if (parentDU != null){
+ AttachmentList<DeploymentUnit> subDeploymentList =
parentDU.getAttachment(org.jboss.as.server.deployment.Attachments.SUB_DEPLOYMENTS);
+ for (final DeploymentUnit subDeployment : subDeploymentList) {
+ sipMetaData =
subDeployment.getAttachment(SipMetaData.ATTACHMENT_KEY);
+ if (sipMetaData != null) {
+ sipApplicationName = sipMetaData.getApplicationName();
+ break;
+ }
+ }
}
if (sipApplicationName == null) {
- // not a sip deployment
- return;
- }
- for (final DeploymentUnit subDeployment :
deploymentUnit.getAttachment(org.jboss.as.server.deployment.Attachments.SUB_DEPLOYMENTS))
{
- final EEResourceReferenceProcessorRegistry registry =
subDeployment.getAttachment(Attachments.RESOURCE_REFERENCE_PROCESSOR_REGISTRY);
- // Add a EEResourceReferenceProcessor which handles @Resource
references with no mappedName
- registry.registerResourceReferenceProcessor(new
SipFactoryResourceProcessor(deploymentUnit));
- registry.registerResourceReferenceProcessor(new
SipSessionsUtilResourceProcessor(deploymentUnit));
- registry.registerResourceReferenceProcessor(new
SipTimerServiceResourceProcessor(deploymentUnit));
-
- // Create binding between jndi path and injection source
- final EEModuleDescription description =
subDeployment.getAttachment(Attachments.EE_MODULE_DESCRIPTION);
- if (description == null) {
- continue;
- }
- for (String jndiBaseSip: JNDI_BASE_FOR_SIP) {
- final String jndiBaseMapped = jndiBaseSip +
SIP_PREFIX_JNDI + sipApplicationName + "/";
- description.getBindingConfigurations().add(new
BindingConfiguration(jndiBaseMapped + SIP_FACTORY_JNDI, new
SipFactoryInjectionSource(deploymentUnit)));
- description.getBindingConfigurations().add(new
BindingConfiguration(jndiBaseMapped + SIP_SESSIONS_UTIL_JNDI, new
SipSessionsUtilInjectionSource(deploymentUnit)));
- description.getBindingConfigurations().add(new
BindingConfiguration(jndiBaseMapped + SIP_TIMER_SERVICE_JNDI, new
SipTimerServiceInjectionSource(deploymentUnit)));
- }
- }
+ // not a sip deployment
+ return;
+ }
+ // anchorDU will have a SIPWebContext.ATTACHMENT so jndi lookups
can be resolved to context resources
+ final DeploymentUnit anchorDU = (parentDU == null)?
deploymentUnit : parentDU;
+ setupSipJndiBindingsPerDeploymentUnit(anchorDU, deploymentUnit,
sipApplicationName);
}
@Override
public void undeploy(final DeploymentUnit context) {
+ // TODO: do we need to explictly remove jndi bindings?
}
-}
+ private static void setupSipJndiBindingsPerDeploymentUnit(final
DeploymentUnit anchorDU, final DeploymentUnit subDU, final String
sipApplicationName) {
+ final EEResourceReferenceProcessorRegistry registry =
subDU.getAttachment(Attachments.RESOURCE_REFERENCE_PROCESSOR_REGISTRY);
+ // Add a EEResourceReferenceProcessor which handles @Resource references
with no mappedName
+ registry.registerResourceReferenceProcessor(new
SipFactoryResourceProcessor(anchorDU));
+ registry.registerResourceReferenceProcessor(new
SipSessionsUtilResourceProcessor(anchorDU));
+ registry.registerResourceReferenceProcessor(new
SipTimerServiceResourceProcessor(anchorDU));
+
+ // Create binding between jndi path and injection source
+ final EEModuleDescription description =
subDU.getAttachment(Attachments.EE_MODULE_DESCRIPTION);
+ if (description == null) {
+ return;
+ }
+ // Add bindings proper
+ for (String jndiBaseSip: JNDI_BASE_FOR_SIP) {
+ final String jndiBaseMapped = jndiBaseSip + SIP_PREFIX_JNDI +
sipApplicationName + "/";
+ description.getBindingConfigurations().add(new
BindingConfiguration(jndiBaseMapped + SIP_FACTORY_JNDI, new
SipFactoryInjectionSource(anchorDU)));
+ description.getBindingConfigurations().add(new
BindingConfiguration(jndiBaseMapped + SIP_SESSIONS_UTIL_JNDI, new
SipSessionsUtilInjectionSource(anchorDU)));
+ description.getBindingConfigurations().add(new
BindingConfiguration(jndiBaseMapped + SIP_TIMER_SERVICE_JNDI, new
SipTimerServiceInjectionSource(anchorDU)));
+ }
+ }
+}
=======================================
---
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Fri May 25 05:43:04 2012
+++
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Sat Jul 21 10:32:01 2012
@@ -1519,5 +1519,15 @@
public void setInstanceManager(InstanceManager instanceManager) {
super.setInstanceManager(instanceManager);
}
+
+ // http://code.google.com/p/sipservlets/issues/detail?id=135
+ @Override
+ public void bindThreadBindingListener() {
+ super.getThreadBindingListener().bind();
+ }
+ @Override
+ public void unbindThreadBindingListener() {
+ super.getThreadBindingListener().unbind();
+ }
}
=======================================
---
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipContext.java
Thu Sep 8 06:23:02 2011
+++
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipContext.java
Sat Jul 21 10:32:01 2012
@@ -179,4 +179,8 @@
boolean authorize(MobicentsSipServletRequest request);
SipDigestAuthenticator getDigestAuthenticator();
-}
+
+ // http://code.google.com/p/sipservlets/issues/detail?id=135
+ void bindThreadBindingListener();
+ void unbindThreadBindingListener();
+}
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
Wed Nov 16 13:44:45 2011
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
Sat Jul 21 10:32:01 2012
@@ -269,6 +269,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(logger.isDebugEnabled()) {
logger.debug("Invoking instance
" + servlet);
@@ -278,6 +280,8 @@
sipServletImpl.deallocate(servlet);
}
} finally {
+ //
http://code.google.com/p/sipservlets/issues/detail?id=135
+ sipContext.unbindThreadBindingListener();
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
}
@@ -319,6 +323,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(logger.isDebugEnabled()) {
logger.debug("Invoking instance
" + servlet);
@@ -331,6 +337,8 @@
sipServletImpl.deallocate(servlet);
}
} finally {
+ //
http://code.google.com/p/sipservlets/issues/detail?id=135
+ sipContext.unbindThreadBindingListener();
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
}
@@ -362,6 +370,9 @@
if(!securityCheck(request)) return;
+ //
http://code.google.com/p/sipservlets/issues/detail?id=135
+ sipContext.bindThreadBindingListener();
+
if(logger.isDebugEnabled()) {
logger.debug("Invoking instance " +
servlet);
}
@@ -372,6 +383,8 @@
sipServletImpl.deallocate(servlet);
}
} finally {
+ //
http://code.google.com/p/sipservlets/issues/detail?id=135
+ sipContext.unbindThreadBindingListener();
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
} else if(sipContext.getSipRubyController() != null) {
@@ -456,6 +469,8 @@
try {
final ClassLoader cl =
sipContext.getSipContextClassLoader();
Thread.currentThread().setContextClassLoader(cl);
+ //
http://code.google.com/p/sipservlets/issues/detail?id=135
+ sipContext.bindThreadBindingListener();
try {
servlet.service(null, response);
@@ -463,6 +478,8 @@
sipServletImpl.deallocate(servlet);
}
} 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/timers/ServletTimerImpl.java
Thu Sep 8 02:18:19 2011
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/ServletTimerImpl.java
Sat Jul 21 10:32:01 2012
@@ -296,6 +296,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);
listener.timeout(this);
@@ -303,6 +305,8 @@
logger.error("An unexpected exception happened in the timer
callback!",t);
} finally {
try {
+ //
http://code.google.com/p/sipservlets/issues/detail?id=135
+ sipContext.unbindThreadBindingListener();
Thread.currentThread().setContextClassLoader(oldClassLoader);
if (isRepeatingTimer) {
estimateNextExecution();
==============================================================================
Revision: 27cb70026004
Author: josemrecio <[email protected]>
Date: Sun Jul 22 12:13:52 2012
Log: Update Issue 135
Backport to TelScale branch
Additional changes including async extension and listener invocations
(cherry picked from commit 36957edb64c8e4c67a1ca16eafda3d82361fd20a)
http://code.google.com/p/sipservlets/source/detail?r=27cb70026004
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
Wed Jul 18 03:30:10 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);
}
}
==============================================================================
Revision: ad6ec9f52ffb
Author: josemrecio <[email protected]>
Date: Tue Jul 24 11:41:05 2012
Log: Update Issue 135
Backport to TelScale branch
Only java:comp/env jndi bindings are created
(cherry picked from commit 5cab2d550fe6f58162aed8bc0eb2b36e889c3b30)
http://code.google.com/p/sipservlets/source/detail?r=ad6ec9f52ffb
Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
Sat Jul 21 10:32:01 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
Tue Jul 24 11:41:05 2012
@@ -39,7 +39,8 @@
*/
public class SipJndiBindingProcessor implements DeploymentUnitProcessor {
- static final String[] JNDI_BASE_FOR_SIP =
{"java:", "java:app/", "java:comp/env/"};
+// static final String[] JNDI_BASE_FOR_SIP =
{"java:", "java:app/", "java:comp/env/"};
+ static final String[] JNDI_BASE_FOR_SIP = {"java:comp/env/"};
static final String SIP_PREFIX_JNDI = "sip/";
static final String SIP_FACTORY_JNDI = "SipFactory";
static final String SIP_SESSIONS_UTIL_JNDI = "SipSessionsUtil";
==============================================================================
Revision: 003c7c14e2d3
Author: josemrecio <[email protected]>
Date: Tue Jul 24 11:44:47 2012
Log: Update Issue 135
Backport to TelScale branch
Revert "Only java:comp/env jndi bindings are created"
This reverts commit 5cab2d550fe6f58162aed8bc0eb2b36e889c3b30.
(cherry picked from commit 9137335c63a7e38e0978d11f3156a931f20f94d9)
http://code.google.com/p/sipservlets/source/detail?r=003c7c14e2d3
Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
Tue Jul 24 11:41:05 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
Tue Jul 24 11:44:47 2012
@@ -39,8 +39,7 @@
*/
public class SipJndiBindingProcessor implements DeploymentUnitProcessor {
-// static final String[] JNDI_BASE_FOR_SIP =
{"java:", "java:app/", "java:comp/env/"};
- static final String[] JNDI_BASE_FOR_SIP = {"java:comp/env/"};
+ static final String[] JNDI_BASE_FOR_SIP =
{"java:", "java:app/", "java:comp/env/"};
static final String SIP_PREFIX_JNDI = "sip/";
static final String SIP_FACTORY_JNDI = "SipFactory";
static final String SIP_SESSIONS_UTIL_JNDI = "SipSessionsUtil";
==============================================================================
Revision: 7eabb712118b
Author: josemrecio <[email protected]>
Date: Tue Jul 24 11:47:03 2012
Log: Update Issue 135
Backport to TelScale branch
Only java:comp/env jndi bindings are created
(cherry picked from commit a3b28267c0b5eb64791facf978552af40c00c5be)
http://code.google.com/p/sipservlets/source/detail?r=7eabb712118b
Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
Tue Jul 24 11:44:47 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipJndiBindingProcessor.java
Tue Jul 24 11:47:03 2012
@@ -39,7 +39,8 @@
*/
public class SipJndiBindingProcessor implements DeploymentUnitProcessor {
- static final String[] JNDI_BASE_FOR_SIP =
{"java:", "java:app/", "java:comp/env/"};
+// static final String[] JNDI_BASE_FOR_SIP =
{"java:", "java:app/", "java:comp/env/"};
+ static final String[] JNDI_BASE_FOR_SIP = {"java:comp/env/"};
static final String SIP_PREFIX_JNDI = "sip/";
static final String SIP_FACTORY_JNDI = "SipFactory";
static final String SIP_SESSIONS_UTIL_JNDI = "SipSessionsUtil";
==============================================================================
Revision: 872f4334b420
Author: Jean Deruelle <[email protected]>
Date: Fri Jul 27 05:50:42 2012
Log: Update Issue 135
Backport to TelScale branch
Refactoring to use enterSipContext/exitSipContext for setting threadlocal
and ability to bind the jndi for AS7 without impacting the core code
(cherry picked from commit 2c2a57cf8f118e16aee0da4f29ed5679ae02f2b0)
http://code.google.com/p/sipservlets/source/detail?r=872f4334b420
Modified:
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
/containers/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
/containers/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
/containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipContext.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/dispatchers/MessageDispatcher.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
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/ServletTimerImpl.java
=======================================
---
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Sun Jul 22 12:13:52 2012
+++
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Fri Jul 27 05:50:42 2012
@@ -1525,13 +1525,25 @@
}
// http://code.google.com/p/sipservlets/issues/detail?id=135
- @Override
public void bindThreadBindingListener() {
super.getThreadBindingListener().bind();
}
- @Override
public void unbindThreadBindingListener() {
super.getThreadBindingListener().unbind();
}
-}
+ @Override
+ public void enterSipContext() {
+ final ClassLoader cl = getSipContextClassLoader();
+ Thread.currentThread().setContextClassLoader(cl);
+ // http://code.google.com/p/sipservlets/issues/detail?id=135
+ bindThreadBindingListener();
+ }
+
+ @Override
+ public void exitSipContext(ClassLoader oldClassLoader) {
+ // http://code.google.com/p/sipservlets/issues/detail?id=135
+ unbindThreadBindingListener();
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+ }
+}
=======================================
---
/containers/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Thu Jul 5 07:13:19 2012
+++
/containers/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Fri Jul 27 05:50:42 2012
@@ -1386,4 +1386,15 @@
public SipDigestAuthenticator getDigestAuthenticator() {
return sipDigestAuthenticator;
}
-}
+
+ @Override
+ public void enterSipContext() {
+ final ClassLoader cl = getSipContextClassLoader();
+ Thread.currentThread().setContextClassLoader(cl);
+ }
+
+ @Override
+ public void exitSipContext(ClassLoader oldClassLoader) {
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+ }
+}
=======================================
---
/containers/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Fri May 25 05:43:04 2012
+++
/containers/sip-servlets-tomcat-jboss4/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Fri Jul 27 05:50:42 2012
@@ -1421,4 +1421,15 @@
public SipDigestAuthenticator getDigestAuthenticator() {
return sipDigestAuthenticator;
}
-}
+
+ @Override
+ public void enterSipContext() {
+ final ClassLoader cl = getSipContextClassLoader();
+ Thread.currentThread().setContextClassLoader(cl);
+ }
+
+ @Override
+ public void exitSipContext(ClassLoader oldClassLoader) {
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+ }
+}
=======================================
---
/containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Mon Jun 4 02:33:30 2012
+++
/containers/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Fri Jul 27 05:50:42 2012
@@ -1458,4 +1458,15 @@
public SipDigestAuthenticator getDigestAuthenticator() {
return sipDigestAuthenticator;
}
-}
+
+ @Override
+ public void enterSipContext() {
+ final ClassLoader cl = getSipContextClassLoader();
+ Thread.currentThread().setContextClassLoader(cl);
+ }
+
+ @Override
+ public void exitSipContext(ClassLoader oldClassLoader) {
+ Thread.currentThread().setContextClassLoader(oldClassLoader);
+ }
+}
=======================================
---
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipContext.java
Sat Jul 21 10:32:01 2012
+++
/sip-servlets-core-api/src/main/java/org/mobicents/servlet/sip/core/SipContext.java
Fri Jul 27 05:50:42 2012
@@ -181,6 +181,6 @@
SipDigestAuthenticator getDigestAuthenticator();
// http://code.google.com/p/sipservlets/issues/detail?id=135
- void bindThreadBindingListener();
- void unbindThreadBindingListener();
-}
+ void enterSipContext();
+ void exitSipContext(ClassLoader oldClassLoader);
+}
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java
Sun Jul 22 12:13:52 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/SipApplicationDispatcherImpl.java
Fri Jul 27 05:50:42 2012
@@ -535,10 +535,7 @@
if(connector != null) {
for (SipContext sipContext :
applicationDeployed.values()) {
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();
+ sipContext.enterSipContext();
try {
for (SipConnectorListener connectorListener :
sipContext.getListeners().getSipConnectorListeners()) {
try {
@@ -550,9 +547,7 @@
}
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
-
sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+
sipContext.exitSipContext(oldClassLoader);
}
}
// return;
@@ -807,11 +802,7 @@
if(containerListener != null) {
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
-
+ sipContext.enterSipContext();
try {
if(triggered) {
containerListener.onCongestionControlStarted(congestionControlEvent);
@@ -822,9 +813,7 @@
logger.error("ContainerListener
threw exception", t);
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
-
sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+
sipContext.exitSipContext(oldClassLoader);
}
}
}
@@ -860,20 +849,14 @@
if(containerListener != null) {
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final
ClassLoader cl = sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
-
sipContext.bindThreadBindingListener();
-
+
sipContext.enterSipContext();
try {
sipServletResponse =
containerListener.onRequestThrottled(sipServletRequest,
congestionControlEvent);
} catch
(Throwable t) {
logger.error("ContainerListener threw exception", t);
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
-
sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+
sipContext.exitSipContext(oldClassLoader);
}
if(sipServletResponse
!= null) {
@@ -1075,10 +1058,7 @@
if(sipContext != null) {
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
final SipManager sipManager =
sipContext.getSipManager();
final SipApplicationSessionKey sipApplicationSessionKey =
SessionManagerUtil.getSipApplicationSessionKey(
sipSessionKey.getApplicationName(),
@@ -1157,9 +1137,7 @@
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
-
sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+
sipContext.exitSipContext(oldClassLoader);
}
}
}
@@ -1348,10 +1326,7 @@
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
final SipErrorEvent sipErrorEvent = new
SipErrorEvent(
(SipServletRequest)sipServletMessage,
@@ -1366,9 +1341,7 @@
}
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+ sipContext.exitSipContext(oldClassLoader);
}
final Dialog dialog =
sipSession.getSessionCreatingDialog();
if(!notifiedApplication && sipSession.getProxy() == null
&&
@@ -1412,10 +1385,7 @@
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
final SipErrorEvent sipErrorEvent = new
SipErrorEvent(
(SipServletRequest)sipServletMessage,
@@ -1429,9 +1399,7 @@
}
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+ sipContext.exitSipContext(oldClassLoader);
}
}
return notifiedApplication;
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
Sat Jul 21 10:32:01 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/MessageDispatcher.java
Fri Jul 27 05:50:42 2012
@@ -267,10 +267,7 @@
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
try {
if(logger.isDebugEnabled()) {
logger.debug("Invoking instance
" + servlet);
@@ -279,10 +276,8 @@
} finally {
sipServletImpl.deallocate(servlet);
}
- } finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+ } finally {
+ sipContext.exitSipContext(oldClassLoader);
}
}
}
@@ -321,10 +316,7 @@
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
try {
if(logger.isDebugEnabled()) {
logger.debug("Invoking instance
" + servlet);
@@ -337,9 +329,7 @@
sipServletImpl.deallocate(servlet);
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+ sipContext.exitSipContext(oldClassLoader);
}
}
}
@@ -365,13 +355,9 @@
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
-
- if(!securityCheck(request)) return;
-
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
+
+ if(!securityCheck(request)) return;
if(logger.isDebugEnabled()) {
logger.debug("Invoking instance " +
servlet);
@@ -383,9 +369,7 @@
sipServletImpl.deallocate(servlet);
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+ sipContext.exitSipContext(oldClassLoader);
}
} else if(sipContext.getSipRubyController() != null) {
//handling the ruby case
@@ -467,10 +451,7 @@
}
final ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- final ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
try {
servlet.service(null, response);
@@ -478,9 +459,7 @@
sipServletImpl.deallocate(servlet);
}
} finally {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+ sipContext.exitSipContext(oldClassLoader);
}
}
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionAsyncTask.java
Sun Jul 22 12:13:52 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionAsyncTask.java
Fri Jul 27 05:50:42 2012
@@ -61,10 +61,7 @@
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
boolean batchStarted = false;
try {
- ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
sipContext.enterSipApp(sipApplicationSession, null, false);
batchStarted =
sipContext.enterSipAppHa(true);
@@ -74,9 +71,7 @@
} 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);
+
sipContext.exitSipContext(oldClassLoader);
}
} else {
if(logger.isDebugEnabled()) {
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java
Sun Jul 22 12:13:52 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipApplicationSessionImpl.java
Fri Jul 27 05:50:42 2012
@@ -180,10 +180,8 @@
List<SipApplicationSessionListener> listeners =
sipContext.getListeners().getSipApplicationSessionListeners();
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();
+ ClassLoader oldClassLoader =
java.lang.Thread.currentThread().getContextClassLoader();
+ sipContext.enterSipContext();
SipApplicationSessionEvent event = new
SipApplicationSessionEvent(this.getFacade());
if(logger.isDebugEnabled()) {
logger.debug("notifying sip application session listeners of context "
+
@@ -209,9 +207,7 @@
logger.error("SipApplicationSessionListener
threw exception", t);
}
}
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
java.lang.Thread.currentThread().setContextClassLoader(oldLoader);
+ sipContext.exitSipContext(oldClassLoader);
}
}
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java
Sun Jul 22 12:13:52 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionAsyncTask.java
Fri Jul 27 05:50:42 2012
@@ -64,10 +64,7 @@
boolean batchStarted = false;
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- ClassLoader cl =
sipContext.getSipContextClassLoader();
-
Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
sipContext.enterSipApp(sipApplicationSession, sipSession, false);
batchStarted =
sipContext.enterSipAppHa(true);
@@ -77,9 +74,7 @@
} 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);
+
sipContext.exitSipContext(oldClassLoader);
}
} else {
if(logger.isDebugEnabled()) {
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Sun Jul 22 12:13:52 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/session/SipSessionImpl.java
Fri Jul 27 05:50:42 2012
@@ -329,10 +329,8 @@
logger.debug("notifying sip session listeners of context " +
sipContext.getApplicationName() + " of following event " +
sipSessionEventType);
}
- 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();
+ ClassLoader oldClassLoader =
java.lang.Thread.currentThread().getContextClassLoader();
+ sipContext.enterSipContext();
SipSessionEvent sipSessionEvent = new
SipSessionEvent(this.getFacade());
for (SipSessionListener sipSessionListener :
sipSessionListeners) {
try {
@@ -351,9 +349,7 @@
logger.error("SipSessionListener
threw exception", t);
}
}
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
java.lang.Thread.currentThread().setContextClassLoader(oldLoader);
+ sipContext.exitSipContext(oldClassLoader);
}
}
}
=======================================
---
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/ServletTimerImpl.java
Sat Jul 21 10:32:01 2012
+++
/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/ServletTimerImpl.java
Fri Jul 27 05:50:42 2012
@@ -294,10 +294,7 @@
boolean batchStarted = false;
ClassLoader oldClassLoader =
Thread.currentThread().getContextClassLoader();
try {
- ClassLoader cl = sipContext.getSipContextClassLoader();
- Thread.currentThread().setContextClassLoader(cl);
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.bindThreadBindingListener();
+ sipContext.enterSipContext();
sipContext.enterSipApp(sipApplicationSession, null,
false);
batchStarted = sipContext.enterSipAppHa(true);
listener.timeout(this);
@@ -305,9 +302,7 @@
logger.error("An unexpected exception happened in the timer
callback!",t);
} finally {
try {
- //
http://code.google.com/p/sipservlets/issues/detail?id=135
- sipContext.unbindThreadBindingListener();
-
Thread.currentThread().setContextClassLoader(oldClassLoader);
+ sipContext.exitSipContext(oldClassLoader);
if (isRepeatingTimer) {
estimateNextExecution();
} else {