Revision: 15462
Author: brainslog
Date: Tue Nov 23 17:38:14 2010
Log: Fixing leak in Diameter Base RA Stateless Acct Activities

Update Issue 2153
Status: Fixed
The leak is due to a race condition where state change could happen after answer was sent. Changed to a simpler way of dealing with it.


http://code.google.com/p/mobicents/source/detail?r=15462

Modified:
/trunk/servers/jain-slee/resources/diameter-base/common/ra/src/main/java/org/mobicents/slee/resource/diameter/base/AccountingServerSessionActivityImpl.java

=======================================
--- /trunk/servers/jain-slee/resources/diameter-base/common/ra/src/main/java/org/mobicents/slee/resource/diameter/base/AccountingServerSessionActivityImpl.java Tue Aug 24 10:55:37 2010 +++ /trunk/servers/jain-slee/resources/diameter-base/common/ra/src/main/java/org/mobicents/slee/resource/diameter/base/AccountingServerSessionActivityImpl.java Tue Nov 23 17:38:14 2010
@@ -30,6 +30,7 @@
 import net.java.slee.resource.diameter.base.DiameterMessageFactory;
 import net.java.slee.resource.diameter.base.events.AccountingAnswer;
 import net.java.slee.resource.diameter.base.events.AccountingRequest;
+import net.java.slee.resource.diameter.base.events.avp.AccountingRecordType; import net.java.slee.resource.diameter.base.events.avp.AvpNotAllowedException;
 import net.java.slee.resource.diameter.base.events.avp.DiameterAvp;
 import net.java.slee.resource.diameter.base.events.avp.DiameterIdentity;
@@ -136,14 +137,11 @@
this.serverSession.sendAccountAnswer(new AccountAnswerImpl((Answer) aca.getGenericData()));

       // FIXME: check this?
-      if (isTerminateAfterProcessing()) {
+      if (this.serverSession.isStateless()) {
         endActivity();
-        //        this.serverSession.release();
-        //
-        //      if(!serverSession.isValid()) {
- // String sessionId = this.serverSession.getSessions().get(0).getSessionId(); - // this.baseListener.sessionDestroyed(sessionId, this.serverSession);
-        //      }
+      }
+ else if(aca.getAccountingRecordType() == AccountingRecordType.STOP_RECORD) {
+        endActivity();
       }
     }
     catch (JAvpNotAllowedException e) {

Reply via email to