Missing bits & fixes for Session Idle Timeout (RestComm#85)

Author: brainslog

core/jdiameter-ha/impl/src/main/java/org/mobicents/diameter/impl/ha/timer/ReplicatedTimerFacilityImpl.java

@@ -46,6 +46,7 @@
 
 import org.jdiameter.api.BaseSession;
 import org.jdiameter.client.api.IContainer;
+import org.jdiameter.client.impl.BaseSessionImpl;
 import org.jdiameter.common.api.data.ISessionDatasource;
 import org.jdiameter.common.api.timer.ITimerFacility;
 import org.jdiameter.common.impl.app.AppSessionImpl;
@@ -129,13 +130,25 @@ public void runTask() {
       try {
         DiameterTimerTaskData data = (DiameterTimerTaskData) getData();
         BaseSession bSession = sessionDataSource.getSession(data.getSessionId());
-        if (bSession == null || !bSession.isAppSession()) {
+        if (bSession == null) {
           // FIXME: error ?
+          logger.error("Base Session is null for sessionId: {}", data.getSessionId());
           return;
         }
         else {
-          AppSessionImpl impl = (AppSessionImpl) bSession;
-          impl.onTimer(data.getTimerName());
+          try {
+            if (!bSession.isAppSession()) {
+              BaseSessionImpl impl = (BaseSessionImpl) bSession;
+              impl.onTimer(data.getTimerName());
+            }
+            else {
+              AppSessionImpl impl = (AppSessionImpl) bSession;
+              impl.onTimer(data.getTimerName());
+            }
+          }
+          catch (Exception e) {
+            logger.error("Caught exception from session object!", e);
+          }
         }
       }
       catch (Exception e) {

core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/BaseSessionImpl.java

@@ -98,7 +98,7 @@ public abstract class BaseSessionImpl implements BaseSession {
   protected transient IMessageParser parser;
   protected NetworkReqListener reqListener;
 
-  private Serializable istTimerId;
+  protected Serializable istTimerId;
 
   @Override
   public long getCreationTime() {
@@ -112,14 +112,16 @@ public long getLastAccessedTime() {
 
   protected long setLastAccessTime() {
     lastAccessedTime = System.currentTimeMillis();
-    maxIdleTime = container.getConfiguration().getLongValue(SessionTimeOut.ordinal(), (Long) SessionTimeOut.defValue());
-    if (maxIdleTime > 0) {
-      IAssembler assembler = container.getAssemblerFacility();
-      ITimerFacility timerFacility = assembler.getComponentInstance(ITimerFacility.class);
-      if (istTimerId != null) {
-        timerFacility.cancel(istTimerId);
+    if (sessionId != null) {
+      maxIdleTime = container.getConfiguration().getLongValue(SessionTimeOut.ordinal(), (Long) SessionTimeOut.defValue());
+      if (maxIdleTime > 0) {
+        IAssembler assembler = container.getAssemblerFacility();
+        ITimerFacility timerFacility = assembler.getComponentInstance(ITimerFacility.class);
+        if (istTimerId != null) {
+          timerFacility.cancel(istTimerId);
+        }
+        istTimerId = timerFacility.schedule(this.getSessionId(), IDLE_SESSION_TIMER_NAME, maxIdleTime);
       }
-      istTimerId = timerFacility.schedule(this.getSessionId(), IDLE_SESSION_TIMER_NAME, maxIdleTime);
     }
     return lastAccessedTime;
   }

core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/SessionImpl.java

@@ -62,6 +62,7 @@
 import org.jdiameter.client.api.ISession;
 import org.jdiameter.client.api.parser.IMessageParser;
 import org.jdiameter.common.api.data.ISessionDatasource;
+import org.jdiameter.common.api.timer.ITimerFacility;
 
 /**
  * Implementation for {@link ISession}
@@ -174,6 +175,9 @@ public Request createRequest(Request prevRequest) {
   public void release() {
     isValid = false;
     if (container != null) {
+      if (istTimerId != null) {
+        container.getAssemblerFacility().getComponentInstance(ITimerFacility.class).cancel(istTimerId);
+      }
       container.removeSessionListener(sessionId);
       // FIXME
       container.getAssemblerFacility().getComponentInstance(ISessionDatasource.class).removeSession(sessionId);