[ha.jain-sip] push by jean.deruelle - Update Issue 38... on 2012-12-05 07:34 GMT

[jain-sip]

Revision: ce45bce1060e
Author:   Jean Deruelle <jean.derue...@gmail.com>
Date:     Tue Dec  4 23:33:13 2012
Log:      Update Issue 38
Take only the Header Value so that the parsing is correct on failover and  
it replicates less bytes on the network

Backport from master

(cherry picked from commit 9ef3a7aad0dcf9d3f837fe470368722343a84e73)

http://code.google.com/p/jain-sip/source/detail?r=ce45bce1060e&repo=ha

Modified:
 /core/src/main/java/gov/nist/javax/sip/stack/AbstractHASipDialog.java
  
/jboss-5/src/main/java/org/mobicents/ha/javax/sip/cache/SIPDialogCacheData.java

=======================================
--- /core/src/main/java/gov/nist/javax/sip/stack/AbstractHASipDialog.java	 
Fri May  4 08:43:27 2012
+++ /core/src/main/java/gov/nist/javax/sip/stack/AbstractHASipDialog.java	 
Tue Dec  4 23:33:13 2012
@@ -253,7 +253,8 @@
 				logger.logDebug(getDialogIdToReplicate() + " :  
firstTransactionMethod " + firstTransactionMethod);
                        }
                        if(contactHeader != null) {
-                               dialogMetaData.put(CONTACT_HEADER, 
contactHeader.toString());
+                               // 
http://code.google.com/p/jain-sip/issues/detail?id=38
+                               dialogMetaData.put(CONTACT_HEADER, 
contactHeader.getHeaderValue());
                        }
                        if (logger.isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
 				logger.logDebug(getDialogIdToReplicate() + " : contactHeader " +  
contactHeader);
=======================================
---  
/jboss-5/src/main/java/org/mobicents/ha/javax/sip/cache/SIPDialogCacheData.java	 
Mon May  7 08:16:23 2012
+++  
/jboss-5/src/main/java/org/mobicents/ha/javax/sip/cache/SIPDialogCacheData.java	 
Tue Dec  4 23:33:13 2012
@@ -298,9 +298,16 @@
                haSipDialog.setMetaDataToReplicate(dialogMetaData, recreation);
                haSipDialog.setApplicationDataToReplicate(dialogAppData);
 		final String contactStringified = (String)  
dialogMetaData.get(AbstractHASipDialog.CONTACT_HEADER);
+               if(logger.isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
+                       logger.logDebug("contactStringified " + 
contactStringified);
+               }
                if(contactStringified != null) {
 			Address contactAddress =  
SipFactory.getInstance().createAddressFactory().createAddress(contactStringified);
 			ContactHeader contactHeader =  
SipFactory.getInstance().createHeaderFactory().createContactHeader(contactAddress);
+                       if(logger.isLoggingEnabled(StackLogger.TRACE_DEBUG)) {
+                               logger.logDebug("contactHeader " + 
contactHeader);
+                               logger.logDebug("contactURI " + 
contactHeader.getAddress().getURI());
+                       }
                        haSipDialog.setContactHeader(contactHeader);
                }
        }