Revision: 15615
Author: [email protected]
Date: Fri Dec  3 01:56:53 2010
Log: Update Issue 1875

more fixes while testing integration in MSS
http://code.google.com/p/mobicents/source/detail?r=15615

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 Thu Dec 2 13:12:50 2010 +++ /trunk/servers/jain-sip-ha/core/src/main/java/gov/nist/javax/sip/stack/MobicentsHASIPClientTransaction.java Fri Dec 3 01:56:53 2010
@@ -140,24 +140,25 @@
if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { sipStack.getStackLogger().logDebug(transactionId + " : original Request " + originalRequest);
                        }
+               }
+               Integer state = (Integer) 
transactionMetaData.get(CURRENT_STATE);
+               if(state != null && super.getState() == null) {
+                       super.setState(state);
+ if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { + sipStack.getStackLogger().logDebug(transactionId + " : state " + getState());
+                       }
                }
                String dialogId = (String) transactionMetaData.get(DIALOG_ID);
                if(dialogId != null) {
                        SIPDialog sipDialog = sipStack.getDialog(dialogId);
                        if(sipDialog != null) {
                                setDialog(sipDialog, dialogId);
+                               sipDialog.addTransaction(this);
                        }
if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { sipStack.getStackLogger().logDebug(transactionId + " : dialog Id " + dialogId + " dialog " + sipDialog);
                        }
                }
-               Integer state = (Integer) 
transactionMetaData.get(CURRENT_STATE);
-               if(state != null && super.getState() == null) {
-                       super.setState(state);
- if (sipStack.getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) { - sipStack.getStackLogger().logDebug(transactionId + " : state " + getState());
-                       }
-               }
                super.startTransactionTimer();
        }

=======================================
--- /trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java Thu Dec 2 13:12:50 2010 +++ /trunk/servers/jain-sip-ha/core/src/main/java/org/mobicents/ha/javax/sip/ClusteredSipStackImpl.java Fri Dec 3 01:56:53 2010
@@ -452,7 +452,7 @@
                                                
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
getStackLogger().logDebug("sipStack " + this + " transaction " + transactionId + " server = " + isServer + " is present in the distributed cache");
                                                }
- serverTransactionTable.putIfAbsent(sipTransaction.getTransactionId(), (SIPServerTransaction) sipTransaction); + sipTransaction = serverTransactionTable.putIfAbsent(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");
@@ -469,7 +469,7 @@
                                                
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
getStackLogger().logDebug("sipStack " + this + " transaction " + transactionId + " server = " + isServer + " is present in the distributed cache");
                                                }
- clientTransactionTable.putIfAbsent(sipTransaction.getTransactionId(), (SIPClientTransaction) sipTransaction); + sipTransaction = clientTransactionTable.putIfAbsent(sipTransaction.getTransactionId(), (SIPClientTransaction) sipTransaction);
                                        } else {
                                                
if(getStackLogger().isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
getStackLogger().logDebug("sipStack " + this + " transaction " + transactionId + " server = " + isServer + " is not present in the distributed cache");

Reply via email to