Revision: 15971
Author: [email protected]
Date: Tue Dec 21 03:18:39 2010
Log: Update Issue 1874
Fixing NPE
http://code.google.com/p/mobicents/source/detail?r=15971
Modified:
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/SipApplicationSessionTaskFactory.java
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/SipApplicationSessionTaskFactory.java
Fri Dec 10 04:56:47 2010
+++
/trunk/servers/sip-servlets/sip-servlets-jboss5/src/main/java/org/mobicents/servlet/sip/core/timers/SipApplicationSessionTaskFactory.java
Tue Dec 21 03:18:39 2010
@@ -53,21 +53,21 @@
public TimerTask newTimerTask(TimerTaskData data) {
SipApplicationSessionTaskData sasData =
(SipApplicationSessionTaskData)data;
MobicentsSipApplicationSession sipApplicationSession =
sipManager.getSipApplicationSession(sasData.getKey(), false);
- if(sipApplicationSession.getExpirationTimerTask() == null) {
-
if(((SipContext)sipManager.getContainer()).getConcurrencyControlMode() !=
ConcurrencyControlMode.SipApplicationSession) {
- if(logger.isDebugEnabled()) {
- if(sipApplicationSession == null) {
- logger.debug("sip application session for key " + sasData.getKey()
+ " was not found neither locally or in the cache, sas expiration timer
recreation will be problematic");
- } else {
- logger.debug("sip application session for key " + sasData.getKey()
+ " was found");
- }
- }
- FaultTolerantSasTimerTask faultTolerantSasTimerTask = new
FaultTolerantSasTimerTask(sipApplicationSession, sasData);
- if(sipApplicationSession != null) {
-
sipApplicationSession.setExpirationTimerTask(faultTolerantSasTimerTask);
- }
- return faultTolerantSasTimerTask;
- }
+ if(sipApplicationSession != null) {
+ if(sipApplicationSession.getExpirationTimerTask() ==
null) {
+
if(((SipContext)sipManager.getContainer()).getConcurrencyControlMode() !=
ConcurrencyControlMode.SipApplicationSession) {
+ if(logger.isDebugEnabled()) {
+ logger.debug("sip application session for key " + sasData.getKey()
+ " was found");
+ }
+ FaultTolerantSasTimerTask faultTolerantSasTimerTask = new
FaultTolerantSasTimerTask(sipApplicationSession, sasData);
+ if(sipApplicationSession != null) {
+
sipApplicationSession.setExpirationTimerTask(faultTolerantSasTimerTask);
+ }
+ return faultTolerantSasTimerTask;
+ }
+ }
+ } else {
+ logger.debug("sip application session for key " + sasData.getKey() + "
was not found neither locally or in the cache, not recovering the sas timer
task");
}
// returning null to avoid recovery since it was already
recovered above
return null;