Revision: 15681
Author: [email protected]
Date: Wed Dec 8 12:32:49 2010
Log: Update Issue 1875
Fixing memory leak issue on retransmissions on failover
http://code.google.com/p/mobicents/source/detail?r=15681
Modified:
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPClientTransaction.java
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPClientTransaction.java
Wed Dec 8 10:09:53 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPClientTransaction.java
Wed Dec 8 12:32:49 2010
@@ -156,8 +156,7 @@
if (logger.isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
logger.logDebug(transactionId + " : dialog Id " + dialogId + "
dialog " + sipDialog);
}
- }
- super.startTransactionTimer();
+ }
}
@Override
@@ -175,4 +174,8 @@
public void setApplicationDataToReplicate(Object appData) {
super.setApplicationData(appData);
}
-}
+
+ public void startTransactionTimerOnFailover() {
+ super.startTransactionTimer();
+ }
+}
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
Wed Dec 8 10:09:53 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
Wed Dec 8 12:32:49 2010
@@ -27,6 +27,7 @@
import gov.nist.javax.sip.message.SIPRequest;
import gov.nist.javax.sip.message.SIPResponse;
import gov.nist.javax.sip.stack.MessageChannel;
+import gov.nist.javax.sip.stack.MobicentsHASIPClientTransaction;
import gov.nist.javax.sip.stack.SIPClientTransaction;
import gov.nist.javax.sip.stack.SIPDialog;
import gov.nist.javax.sip.stack.SIPServerTransaction;
@@ -475,7 +476,11 @@
}
SIPClientTransaction retval =
clientTransactionTable.putIfAbsent(txId, (SIPClientTransaction)
sipTransaction);
if(retval != null) {
- sipTransaction = retval;
+ sipTransaction = retval;
+ } else {
+ // start the transaction timer only when the transaction has been
added to the stack
+ // to avoid leaks on
retransmissions
+
((MobicentsHASIPClientTransaction)sipTransaction).startTransactionTimerOnFailover();
}
} else {
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {