Revision: abb37c0f26f3
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Wed Jul 18 08:03:49 2012
Log: Update Issue 8
Backporting to NIO Branch
(cherry picked from commit d0ab3c2132c862c6ddee3ca9b493662d65715a66)
git-svn-id:
https://svn.java.net/svn/jsip~svn/branches/JAIN-SIP-NIO-year-2012@2133
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=abb37c0f26f3
Modified:
/src/gov/nist/javax/sip/stack/SIPClientTransaction.java
/src/gov/nist/javax/sip/stack/SIPDialog.java
/src/gov/nist/javax/sip/stack/SIPServerTransaction.java
/src/gov/nist/javax/sip/stack/SIPTransaction.java
/src/gov/nist/javax/sip/stack/SIPTransactionStack.java
=======================================
--- /src/gov/nist/javax/sip/stack/SIPClientTransaction.java Thu Mar 29
09:55:53 2012
+++ /src/gov/nist/javax/sip/stack/SIPClientTransaction.java Wed Jul 18
08:03:49 2012
@@ -1725,6 +1725,9 @@
}
}
if(originalRequest != null) {
+ // http://java.net/jira/browse/JSIP-429
+ // store the merge id from the tx to avoid reparsing of
request on aggressive cleanup
+ super.mergeId =
((SIPRequest)originalRequest).getMergeId();
originalRequest.setTransaction(null);
originalRequest.setInviteTransaction(null);
originalRequest.cleanUp();
@@ -1762,11 +1765,14 @@
if(defaultDialog != null) {
defaultDialogId = defaultDialog.getDialogId();
defaultDialog = null;
- }
+ }
// we keep the request in a byte array to be able to recreate it
// no matter what to keep API backward compatibility
if(originalRequest != null && originalRequestBytes == null) {
originalRequestBytes =
originalRequest.encodeAsBytes(this.getTransport());
+ // http://java.net/jira/browse/JSIP-429
+ // store the merge id from the tx to avoid reparsing of
request on aggressive cleanup
+ super.mergeId = ((SIPRequest)originalRequest).getMergeId();
}
originalRequest = null;
cleanUpOnTimer();
=======================================
--- /src/gov/nist/javax/sip/stack/SIPDialog.java Tue May 8 09:50:15 2012
+++ /src/gov/nist/javax/sip/stack/SIPDialog.java Wed Jul 18 08:03:49 2012
@@ -1767,7 +1767,7 @@
if (transaction instanceof SIPServerTransaction
&& dialog.firstTransactionMethod.equals(Request.INVITE)) {
sipStack.removeMergeDialog(firstTransactionMergeId);
- dialog.firstTransactionMergeId = ((SIPRequest)
transaction.getRequest()).getMergeId();
+ dialog.firstTransactionMergeId = transaction.getMergeId();
sipStack.putMergeDialog(this);
}
=======================================
--- /src/gov/nist/javax/sip/stack/SIPServerTransaction.java Wed Mar 21
12:53:59 2012
+++ /src/gov/nist/javax/sip/stack/SIPServerTransaction.java Wed Jul 18
08:03:49 2012
@@ -1942,7 +1942,7 @@
+ getTransactionId());
}
// we keep the request in a byte array to be able to recreate
it
- // no matter what to keep API backward compatibility
+ // no matter what to keep API backward compatibility
if(originalRequest == null && originalRequestBytes != null) {
try {
originalRequest = (SIPRequest)
sipStack.getMessageParserFactory().createMessageParser(sipStack).parseSIPMessage(originalRequestBytes,
true, false, null);
@@ -1953,6 +1953,9 @@
} else if (originalRequest != null && originalRequestBytes ==
null) {
originalRequestBytes =
originalRequest.encodeAsBytes(this.getTransport());
}
+ // http://java.net/jira/browse/JSIP-429
+ // store the merge id from the tx to avoid reparsing of
request on aggressive cleanup
+ super.mergeId = ((SIPRequest)originalRequest).getMergeId();
sipStack.removeTransaction(this);
cleanUpOnTimer();
// commented out because the application can hold on a ref to
the tx
@@ -2022,6 +2025,9 @@
inviteTransaction = null;
}
if(originalRequest != null) {
+ // http://java.net/jira/browse/JSIP-429
+ // store the merge id from the tx to avoid reparsing of
request on aggressive cleanup
+ super.mergeId = ((SIPRequest)originalRequest).getMergeId();
originalRequest.setTransaction(null);
originalRequest.setInviteTransaction(null);
if(!getMethod().equalsIgnoreCase(Request.INVITE)) {
=======================================
--- /src/gov/nist/javax/sip/stack/SIPTransaction.java Fri Apr 13 08:43:43
2012
+++ /src/gov/nist/javax/sip/stack/SIPTransaction.java Wed Jul 18 08:03:49
2012
@@ -250,6 +250,7 @@
// caching fork id
private String forkId = null;
+ protected String mergeId = null;
public ExpiresTimerTask expiresTimerTask;
// http://java.net/jira/browse/JSIP-420
@@ -493,7 +494,7 @@
public Request getRequest() {
if(isReleaseReferences() && originalRequest == null &&
originalRequestBytes != null) {
if(logger.isLoggingEnabled(StackLogger.TRACE_WARN)) {
- logger.logWarning("reparsing original request " +
originalRequestBytes + " since it was eagerly cleaned up, but beware this
is not efficient with the aggressive flag set !");
+ logger.logWarning("reparsing original request " +
originalRequestBytes + " since it was eagerly cleaned up, but beware this
is not efficient with the aggressive flag set !");
}
try {
originalRequest = (SIPRequest)
sipStack.getMessageParserFactory().createMessageParser(sipStack).parseSIPMessage(originalRequestBytes,
true, false, null);
@@ -1665,4 +1666,14 @@
maxTxLifeTimeListener = null;
}
}
-}
+
+ /**
+ * @return the mergeId
+ */
+ public String getMergeId() {
+ if(mergeId == null) {
+ return ((SIPRequest)getRequest()).getMergeId();
+ }
+ return mergeId;
+ }
+}
=======================================
--- /src/gov/nist/javax/sip/stack/SIPTransactionStack.java Mon Jul 16
02:49:59 2012
+++ /src/gov/nist/javax/sip/stack/SIPTransactionStack.java Wed Jul 18
08:03:49 2012
@@ -1381,9 +1381,11 @@
*/
public void removeFromMergeTable(SIPServerTransaction tr) {
if (logger.isLoggingEnabled(LogWriter.TRACE_DEBUG)) {
- this.logger.logDebug("Removing tx from merge table ");
- }
- String key = ((SIPRequest) tr.getRequest()).getMergeId();
+ logger.logDebug("Removing tx from merge table ");
+ }
+ // http://java.net/jira/browse/JSIP-429
+ // get the merge id from the tx instead of the request to avoid
reparsing on aggressive cleanup
+ String key = tr.getMergeId();
if (key != null) {
this.mergeTable.remove(key);
}