[mobicents] r12216 committed - Fixes Issue 1503

[mobicents]

Revision: 12216
Author: jean.deruelle
Date: Fri Jun 11 05:21:40 2010
Log: Fixes Issue 1503
http://code.google.com/p/mobicents/source/detail?r=12216
Modified:
  
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/DefaultSasTimerTask.java
  
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/StandardSasTimerTask.java

=======================================
---  
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/DefaultSasTimerTask.java	 
Wed Apr  7 11:37:37 2010
+++  
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/DefaultSasTimerTask.java	 
Fri Jun 11 05:21:40 2010
@@ -54,13 +54,12 @@
 			logger.debug("initial kick off of SipApplicationSessionTimerTask  
running for sip application session " + sipApplicationSession.getId());
                }

-               long now = System.currentTimeMillis();
-               if(sipApplicationSession.getExpirationTimeInternal() > now) {
+               long sleep = getDelay();
+               if(sleep > 0) {
                        // if the session has been accessed since we started 
it, put it to sleep
-                       long sleep =  getDelay();
                        if(logger.isDebugEnabled()) {
 				logger.debug("expirationTime is " +  
sipApplicationSession.getExpirationTimeInternal() +
-                                               ", now is " + now +
+                                               ", now is " + 
System.currentTimeMillis() +
                                                " sleeping for " + sleep / 1000L + " 
seconds");
                        }
                        final SipContext sipContext = 
sipApplicationSession.getSipContext();
=======================================
---  
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/StandardSasTimerTask.java	 
Fri Apr 30 08:03:35 2010
+++  
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/timers/StandardSasTimerTask.java	 
Fri Jun 11 05:21:40 2010
@@ -52,13 +52,12 @@
 			logger.debug("initial kick off of SipApplicationSessionTimerTask  
running for sip application session " + sipApplicationSession.getId());
                }

-               long now = System.currentTimeMillis();
-               if(sipApplicationSession.getExpirationTimeInternal() > now) {
+               long sleep = getDelay();
+               if(sleep > 0) {
                        // if the session has been accessed since we started 
it, put it to sleep
-                       long sleep =  getDelay();
                        if(logger.isDebugEnabled()) {
 				logger.debug("expirationTime is " +  
sipApplicationSession.getExpirationTimeInternal() +
-                                               ", now is " + now +
+                                               ", now is " + 
System.currentTimeMillis() +
                                                " sleeping for " + sleep / 1000L + " 
seconds");
                        }
                        final SipContext sipContext = 
sipApplicationSession.getSipContext();