Revision: 15624
Author: gvagenas
Date: Fri Dec 3 10:13:06 2010
Log: Fix for the test:
org.mobicents.servlet.sip.testsuite.simple.ShootistSipServletTest.testShootistSipServletListener
http://code.google.com/p/mobicents/source/detail?r=15624
Modified:
/branches/servers/sip-servlets/2.0/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
=======================================
---
/branches/servers/sip-servlets/2.0/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Fri Nov 19 13:36:13 2010
+++
/branches/servers/sip-servlets/2.0/tomcat-7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Fri Dec 3 10:13:06 2010
@@ -268,9 +268,9 @@
if(logger.isInfoEnabled()) {
logger.info("Starting the sip context");
}
- if( this.getState().equals(LifecycleState.INITIALIZED)) {
+// if( this.getState().equals(LifecycleState.INITIALIZED)) {
prepareServletContext();
- }
+// }
// Add missing components as necessary
boolean ok = true;
if (getResources() == null) { // (1) Required by Loader
@@ -600,6 +600,7 @@
// Issue 1478 : nullify the ref to avoid reusing it
timerService = null;
getServletContext().setAttribute(javax.servlet.sip.SipServlet.TIMER_SERVICE,
null);
+ setLoader(null);
// not needed since the JNDI will be destroyed automatically
// if(isUseNaming()) {
//
fireContainerEvent(SipNamingContextListener.NAMING_CONTEXT_SIP_FACTORY_REMOVED_EVENT,
sipFactoryFacade);