Revision: 22fac0776761
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Fri Dec 14 07:33:10 2012
Log: Update Issue 34
(git repo)
JSIP-438
Making sure T2 is used everywhere it ought to be as it is configurable.
MAXIMUM_RETRANSMISSION_TICK_COUNT was redundant with T2 value.
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2264
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=22fac0776761
Modified:
/src/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java
/src/gov/nist/javax/sip/stack/SIPTransactionImpl.java
=======================================
--- /src/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java Thu Nov 29
12:46:08 2012
+++ /src/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java Fri Dec 14
07:33:10 2012
@@ -608,7 +608,7 @@
if (TransactionState._TRYING == this.getInternalState()) {
if (statusCode / 100 == 1) {
this.setState(TransactionState._PROCEEDING);
- enableRetransmissionTimer(MAXIMUM_RETRANSMISSION_TICK_COUNT);
+ enableRetransmissionTimer(getTimerT2());
enableTimeoutTimer(TIMER_F);
// According to RFC, the TU has to be informed on
// this transition.
=======================================
--- /src/gov/nist/javax/sip/stack/SIPTransactionImpl.java Thu Nov 29
12:46:08 2012
+++ /src/gov/nist/javax/sip/stack/SIPTransactionImpl.java Fri Dec 14
07:33:10 2012
@@ -130,11 +130,6 @@
// Audit tag used by the SIP Stack audit
protected long auditTag = 0;
- /**
- * Maximum number of ticks between retransmissions.
- */
- protected static final int MAXIMUM_RETRANSMISSION_TICK_COUNT = 8;
-
// Parent stack for this transaction
protected transient SIPTransactionStack sipStack;
@@ -602,7 +597,7 @@
} else {
// non-INVITE transactions and 3xx-6xx responses are capped at
T2
retransmissionTimerTicksLeft = Math.min(tickCount,
- MAXIMUM_RETRANSMISSION_TICK_COUNT);
+ getTimerT2());
}
retransmissionTimerLastTickCount = retransmissionTimerTicksLeft;
}
