Revision: 15605
Author: [email protected]
Date: Thu Dec 2 07:59:29 2010
Log: Update Issue 1875
Bug fixing while integrating the early dialog failover code in MSS
http://code.google.com/p/mobicents/source/detail?r=15605
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/core/src/main/java/org/mobicents/ha/javax/sip/HASipDialogFactory.java
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java
Wed Dec 1 10:30:25 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPserverTransaction.java
Thu Dec 2 07:59:29 2010
@@ -163,14 +163,7 @@
@Override
public void setApplicationData(Object applicationData) {
- super.setApplicationData(applicationData);
-
if(((ClusteredSipStack)getSIPStack()).isReplicateApplicationData()) {
- try {
-
((ClusteredSipStack)getSIPStack()).getSipCache().putServerTransaction(this);
- } catch (SipCacheException e) {
- getSIPStack().getStackLogger().logError("problem storing server
transaction " + transactionId + " into the distributed cache", e);
- }
- }
+ super.setApplicationData(applicationData);
}
public Object getApplicationDataToReplicate() {
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStack.java
Wed Dec 1 10:30:25 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStack.java
Thu Dec 2 07:59:29 2010
@@ -46,7 +46,7 @@
public static final String REPLICATE_APPLICATION_DATA
= "org.mobicents.ha.javax.sip.REPLICATE_APPLICATION_DATA";
SIPDialog getDialog(String dialogId);
- void putDialog(SIPDialog dialog);
+ SIPDialog putDialog(SIPDialog dialog);
void removeDialog(SIPDialog dialog);
void remoteDialogRemoval(String dialogId);
void passivateDialog(HASipDialog dialog);
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
Thu Dec 2 01:43:30 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java
Thu Dec 2 07:59:29 2010
@@ -297,7 +297,12 @@
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
getStackLogger().logDebug("dialog " + dialogId + " found in the
distributed cache, storing it locally");
}
- super.putDialog(sipDialog);
+ SIPDialog existingDialog =
super.putDialog(sipDialog);
+ // avoid returning wrong dialog
if 2 threads try to recreate
+ // the dialog after failover,
we use the one that won the race
+ if(existingDialog != null) {
+ sipDialog =
existingDialog;
+ }
} else {
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
getStackLogger().logDebug("dialog " + dialogId + " not found in the
distributed cache");
@@ -326,8 +331,8 @@
* @see
gov.nist.javax.sip.stack.SIPTransactionStack#putDialog(gov.nist.javax.sip.stack.SIPDialog)
*/
@Override
- public void putDialog(SIPDialog dialog) {
- super.putDialog(dialog);
+ public SIPDialog putDialog(SIPDialog dialog) {
+ return super.putDialog(dialog);
// not needed it was causing the dialog to be put in the cache even for
1xx with a to tag
// if (!sipCache.inLocalMode() && DialogState.CONFIRMED ==
dialog.getState()) {
// // only replicate dialogs in confirmed state
=======================================
---
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/HASipDialogFactory.java
Fri Nov 26 13:41:33 2010
+++
/trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/HASipDialogFactory.java
Thu Dec 2 07:59:29 2010
@@ -42,7 +42,7 @@
case ConfirmedDialogNoApplicationData:
return new
ConfirmedNoAppDataReplicationSipDialog(transaction);
case EarlyDialog:
- return new
ConfirmedNoAppDataReplicationSipDialog(transaction);
+ return new ConfirmedReplicationSipDialog(transaction);
default:
throw new IllegalArgumentException("Replication Strategy " +
replicationStrategy + " is not supported");
}
@@ -55,7 +55,7 @@
case ConfirmedDialogNoApplicationData:
return new ConfirmedNoAppDataReplicationSipDialog(transaction,
sipResponse);
case EarlyDialog:
- return new ConfirmedNoAppDataReplicationSipDialog(transaction,
sipResponse);
+ return new ConfirmedReplicationSipDialog(transaction,
sipResponse);
default:
throw new IllegalArgumentException("Replication Strategy " +
replicationStrategy + " is not supported");
}
@@ -68,7 +68,7 @@
case ConfirmedDialogNoApplicationData:
return new ConfirmedNoAppDataReplicationSipDialog(sipProvider,
sipResponse);
case EarlyDialog:
- return new ConfirmedNoAppDataReplicationSipDialog(sipProvider,
sipResponse);
+ return new ConfirmedReplicationSipDialog(sipProvider,
sipResponse);
default:
throw new IllegalArgumentException("Replication Strategy " +
replicationStrategy + " is not supported");
}