Revision: 15599
Author: [email protected]
Date: Wed Dec 1 10:30:25 2010
Log: Update Issue 1875
Fixing mem leaks, test for B2BUA use case working with checks for mem leaks
http://code.google.com/p/mobicents/source/detail?r=15599
Modified:
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStack.java
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTCPTest.java
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTest.java
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUA.java
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java
Wed Dec 1 08:25:59 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java
Wed Dec 1 10:30:25 2010
@@ -129,7 +129,7 @@
sipStack.getStackLogger().logError("problem storing server
transaction " + transactionId + " into the distributed cache", e);
}
}
- super.sendResponse(response);
+ super.sendMessage(message);
}
public void setMetaDataToReplicate(Map<String, Object>
transactionMetaData,
@@ -153,7 +153,7 @@
}
}
Integer state = (Integer)
transactionMetaData.get(CURRENT_STATE);
- if(state != null) {
+ if(state != null && super.getState() == null) {
setState(state);
if
(sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
sipStack.getStackLogger().logDebug(transactionId + " : state " +
getState());
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStack.java
Mon Nov 29 12:25:49 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStack.java
Wed Dec 1 10:30:25 2010
@@ -84,4 +84,5 @@
SIPTransaction findTransaction(String transactionId, boolean isServer);
boolean isReplicateApplicationData();
-}
+ void remoteServerTransactionRemoval(String transactionId);
+}
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
Wed Dec 1 08:25:59 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
Wed Dec 1 10:30:25 2010
@@ -446,7 +446,7 @@
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
getStackLogger().logDebug("sipStack " + this + " transaction " +
transactionId + " server = " + isServer + " is present in the distributed
cache");
}
- serverTransactionTable.put(transactionId, (SIPServerTransaction)
sipTransaction);
+ serverTransactionTable.put(sipTransaction.getTransactionId(),
(SIPServerTransaction) sipTransaction);
} else {
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
getStackLogger().logDebug("sipStack " + this + " transaction " +
transactionId + " server = " + isServer + " is not present in the
distributed cache");
@@ -561,4 +561,24 @@
public boolean isReplicateApplicationData() {
return replicateApplicationData;
}
-}
+
+ /*
+ * (non-Javadoc)
+ * @see
org.mobicents.ha.javax.sip.ClusteredSipStack#remoteServerTransactionRemoval(java.lang.String)
+ */
+ public void remoteServerTransactionRemoval(String transactionId) {
+ // note we don't want a dialog terminated event, thus we need to go
directly to map removal
+ // assuming it's a confirmed dialog there is no chance it is on early
dialogs too
+ if (getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG))
{
+ getStackLogger().logDebug("sipStack " + this +
+ " remote Server Transaction Removal of transaction Id : " +
transactionId);
+ }
+ // the transaction id is set to lower case in the cache so it might not
remove it correctly
+ SIPServerTransaction sipServerTransaction =
super.serverTransactionTable.remove(transactionId);
+ if (sipServerTransaction != null) {
+ super.removeFromMergeTable(sipServerTransaction);
+ super.removePendingTransaction(sipServerTransaction);
+ super.removeTransactionPendingAck(sipServerTransaction);
+ }
+ }
+}
=======================================
---
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTCPTest.java
Tue Nov 30 11:48:22 2010
+++
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTCPTest.java
Wed Dec 1 10:30:25 2010
@@ -1272,7 +1272,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(60000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1281,6 +1281,9 @@
// http://code.google.com/p/mobicents/issues/detail?id=1418
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
b2buaNode1.stop();
b2buaNode2.stop();
@@ -1354,7 +1357,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(60000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1364,6 +1367,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
@@ -1436,7 +1442,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(60000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1446,6 +1452,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
@@ -1518,7 +1527,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(80000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1528,6 +1537,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
@@ -1600,7 +1612,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(80000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1610,6 +1622,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
=======================================
---
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTest.java
Tue Nov 30 07:08:01 2010
+++
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/B2BUAEarlyDialogRecoveryOn1xxTest.java
Wed Dec 1 10:30:25 2010
@@ -1268,7 +1268,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(60000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1278,6 +1278,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
@@ -1350,7 +1353,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(60000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1360,6 +1363,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
@@ -1432,7 +1438,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(60000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1442,6 +1448,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
@@ -1514,7 +1523,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(60000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1524,6 +1533,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
@@ -1596,7 +1608,7 @@
shootme.init();
shootist.init("ReInvite");
- Thread.sleep(60000);
+ Thread.sleep(100000);
shootme.checkState(false);
shootist.checkState(false);
@@ -1606,6 +1618,9 @@
assertTrue(b2buaNode1.checkDialogsRemoved());
assertTrue(b2buaNode2.checkDialogsRemoved());
+ assertTrue(b2buaNode1.checkTransactionsRemoved());
+ assertTrue(b2buaNode2.checkTransactionsRemoved());
+
balancer.stop();
b2buaNode1.stop();
b2buaNode2.stop();
=======================================
---
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUA.java
Tue Nov 30 07:08:01 2010
+++
/trunk/servers/jain-sip-ha/jboss-5/src/test/java/org/mobicents/ha/javax/sip/SimpleB2BUA.java
Wed Dec 1 10:30:25 2010
@@ -300,4 +300,16 @@
}
}
-}
+
+ public boolean checkTransactionsRemoved() {
+ System.out.println("client transaction table size " +
((SipStackImpl)sipStack).getClientTransactionTableSize());
+
if(((SipStackImpl)sipStack).getClientTransactionTableSize() > 0) {
+ return false;
+ }
+ System.out.println("server transaction table size " +
((SipStackImpl)sipStack).getServerTransactionTableSize());
+
if(((SipStackImpl)sipStack).getServerTransactionTableSize() > 0) {
+ return false;
+ }
+ return true;
+ }
+}