2 new revisions:
Revision: ed22295cce96
Author: Jean Deruelle <[email protected]>
Date: Thu Nov 8 09:44:23 2012
Log: Update Issue 34...
http://code.google.com/p/jain-sip/source/detail?r=ed22295cce96
Revision: f93a87efacf1
Author: Jean Deruelle <[email protected]>
Date: Fri Dec 14 07:37:16 2012
Log: Update Issue 34...
http://code.google.com/p/jain-sip/source/detail?r=f93a87efacf1
==============================================================================
Revision: ed22295cce96
Author: Jean Deruelle <[email protected]>
Date: Thu Nov 8 09:44:23 2012
Log: Update Issue 34
(git repo)
JSIP-438
Fixes places where was used the BASE_TIMER_INTERVAL constant value instead
of the SipTransaction.baseTimerInterval variable
Also changed the variable names to lower case since they are not constants
to follow the java conventions.
Fixed test that was failing on CI Job
(cherry picked from commit 3a23cde401bd6b67e513bb1c9f2577aa2285ed8d)
http://code.google.com/p/jain-sip/source/detail?r=ed22295cce96
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/test/tck/msgflow/InviteClientTransactionsStateMachineTest.java
/src/test/tck/msgflow/ServerTransactionTest.java
/src/test/unit/gov/nist/javax/sip/stack/DialogIdentityTest.java
=======================================
--- /src/gov/nist/javax/sip/stack/SIPClientTransaction.java Fri Oct 12
07:49:43 2012
+++ /src/gov/nist/javax/sip/stack/SIPClientTransaction.java Thu Nov 8
09:44:23 2012
@@ -634,7 +634,7 @@
} else if (200 <= statusCode && statusCode <= 699) {
if (!isReliable()) {
this.setState(TransactionState._COMPLETED);
- scheduleTimerK(TIMER_K);
+ scheduleTimerK(timerK);
} else {
this.setState(TransactionState._TERMINATED);
}
@@ -662,7 +662,7 @@
disableTimeoutTimer();
if (!isReliable()) {
this.setState(TransactionState._COMPLETED);
- scheduleTimerK(TIMER_K);
+ scheduleTimerK(timerK);
} else {
this.setState(TransactionState._TERMINATED);
}
@@ -686,7 +686,7 @@
}
}
- // avoid re-scheduling the transaction timer every 500ms while we know
we have to wait for TIMER_K * 500 ms
+ // avoid re-scheduling the transaction timer every 500ms while we know
we have to wait for timerK * 500 ms
private void scheduleTimerK(long time) {
if(transactionTimer != null && timerKStarted.compareAndSet(false,
true)) {
synchronized (transactionTimerLock) {
@@ -707,7 +707,7 @@
}
};
if(time > 0) {
- sipStack.getTimer().schedule(task, time *
BASE_TIMER_INTERVAL);
+ sipStack.getTimer().schedule(task, time *
baseTimerInterval);
} else {
task.runTask();
}
@@ -881,7 +881,7 @@
if (!isReliable()) {
this.setState(TransactionState._COMPLETED);
- enableTimeoutTimer(TIMER_D);
+ enableTimeoutTimer(timerD);
} else {
// Proceed immediately to the TERMINATED state.
this.setState(TransactionState._TERMINATED);
@@ -922,7 +922,7 @@
// JvB: update state before passing to app
if (!isReliable()) {
this.setState(TransactionState._COMPLETED);
- this.enableTimeoutTimer(TIMER_D);
+ this.enableTimeoutTimer(timerD);
} else {
this.setState(TransactionState._TERMINATED);
}
@@ -937,7 +937,7 @@
// JvB: duplicate with line 874
// if (!isReliable()) {
- // enableTimeoutTimer(TIMER_D);
+ // enableTimeoutTimer(timerD);
// }
}
} else if (TransactionState._COMPLETED == this.getInternalState())
{
@@ -1404,7 +1404,7 @@
synchronized (transactionTimerLock) {
if(!transactionTimerCancelled) {
transactionTimer = new
TransactionTimer();
- sipStack.getTimer().scheduleWithFixedDelay(transactionTimer,
BASE_TIMER_INTERVAL, BASE_TIMER_INTERVAL);
+ sipStack.getTimer().scheduleWithFixedDelay(transactionTimer,
baseTimerInterval, baseTimerInterval);
}
}
}
=======================================
--- /src/gov/nist/javax/sip/stack/SIPDialog.java Fri Oct 12 07:49:43 2012
+++ /src/gov/nist/javax/sip/stack/SIPDialog.java Thu Nov 8 09:44:23 2012
@@ -1432,7 +1432,7 @@
sipStack.getTimer().schedule(
this.dialogDeleteTask,
SIPTransaction.TIMER_H
- * SIPTransactionStack.BASE_TIMER_INTERVAL);
+ * lastTransaction.baseTimerInterval);
} else {
this.delete();
}
@@ -2860,8 +2860,8 @@
this.timerTask = new DialogTimerTask(transaction);
if ( sipStack.getTimer() != null &&
sipStack.getTimer().isStarted()) {
sipStack.getTimer().scheduleWithFixedDelay(timerTask,
- SIPTransactionStack.BASE_TIMER_INTERVAL,
- SIPTransactionStack.BASE_TIMER_INTERVAL);
+ transaction.baseTimerInterval,
+ transaction.baseTimerInterval);
}
}
} finally {
@@ -4082,7 +4082,7 @@
sipStack.getTimer().schedule(
dialogDeleteIfNoAckSentTask,
sipStack.getAckTimeoutFactor()
- * SIPTransactionStack.BASE_TIMER_INTERVAL);
+ * lastTransaction.baseTimerInterval);
}
}
}
=======================================
--- /src/gov/nist/javax/sip/stack/SIPServerTransaction.java Tue Nov 6
05:30:08 2012
+++ /src/gov/nist/javax/sip/stack/SIPServerTransaction.java Thu Nov 8
09:44:23 2012
@@ -801,7 +801,7 @@
this.setState(TransactionState._CONFIRMED);
disableRetransmissionTimer();
if (!isReliable()) {
- enableTimeoutTimer(TIMER_I);
+ enableTimeoutTimer(timerI);
} else {
@@ -1327,7 +1327,7 @@
}
} else if (TransactionState._CONFIRMED == this.getRealState() &&
isInviteTransaction()) {
- // TIMER_I should not generate a timeout
+ // timerI should not generate a timeout
// exception to the application when the
// Invite transaction is in Confirmed state.
// Just transition to Terminated state.
@@ -1539,7 +1539,7 @@
this.retransmissionAlertTimerTask = new
RetransmissionAlertTimerTask(dialogId);
sipStack.retransmissionAlertTransactions.put(dialogId,
this);
sipStack.getTimer().scheduleWithFixedDelay(this.retransmissionAlertTimerTask,
0,
- SIPTransactionStack.BASE_TIMER_INTERVAL);
+ baseTimerInterval);
}
@@ -1623,7 +1623,7 @@
SIPStackTimerTask myTimer = new TransactionTimer();
// Do not schedule when the stack is not alive.
if (sipStack.getTimer() != null &&
sipStack.getTimer().isStarted() ) {
-
sipStack.getTimer().scheduleWithFixedDelay(myTimer, BASE_TIMER_INTERVAL,
BASE_TIMER_INTERVAL);
+
sipStack.getTimer().scheduleWithFixedDelay(myTimer, baseTimerInterval,
baseTimerInterval);
}
myTimer = null;
}
@@ -1656,7 +1656,7 @@
}
};
if(time > 0) {
- sipStack.getTimer().schedule(task, time * T1 *
BASE_TIMER_INTERVAL);
+ sipStack.getTimer().schedule(task, time * T1 *
baseTimerInterval);
} else {
task.runTask();
}
@@ -1781,7 +1781,7 @@
// Issue 265 :
https://jain-sip.dev.java.net/issues/show_bug.cgi?id=265
this.provisionalResponseTask = new ProvisionalResponseTask();
this.sipStack.getTimer().scheduleWithFixedDelay(provisionalResponseTask, 0,
- SIPTransactionStack.BASE_TIMER_INTERVAL);
+ this.baseTimerInterval);
this.sendMessage((SIPMessage) relResponse);
} catch (Exception ex) {
InternalErrorHandler.handleException(ex);
=======================================
--- /src/gov/nist/javax/sip/stack/SIPTransaction.java Tue Dec 4 23:24:48
2012
+++ /src/gov/nist/javax/sip/stack/SIPTransaction.java Thu Nov 8 09:44:23
2012
@@ -97,24 +97,24 @@
// to see the event.
- protected int BASE_TIMER_INTERVAL =
SIPTransactionStack.BASE_TIMER_INTERVAL;
+ protected int baseTimerInterval =
SIPTransactionStack.BASE_TIMER_INTERVAL;
/**
* 5 sec Maximum duration a message will remain in the network
*/
- protected int T4 = 5000 / BASE_TIMER_INTERVAL;
+ protected int T4 = 5000 / baseTimerInterval;
/**
* The maximum retransmit interval for non-INVITE requests and INVITE
* responses
*/
- protected int T2 = 4000 / BASE_TIMER_INTERVAL;
- protected int TIMER_I = T4;
+ protected int T2 = 4000 / baseTimerInterval;
+ protected int timerI = T4;
- protected int TIMER_K = T4;
+ protected int timerK = T4;
- protected int TIMER_D = 32000 / BASE_TIMER_INTERVAL;
+ protected int timerD = 32000 / baseTimerInterval;
- // protected static final int TIMER_C = 3 * 60 * 1000 /
BASE_TIMER_INTERVAL;
+ // protected static final int TIMER_C = 3 * 60 * 1000 /
baseTimerInterval;
/**
* One timer tick.
@@ -1048,7 +1048,7 @@
* @return the integer value of the retransmit timer in milliseconds.
*/
public int getRetransmitTimer() {
- return SIPTransactionStack.BASE_TIMER_INTERVAL;
+ return baseTimerInterval;
}
/**
@@ -1219,11 +1219,11 @@
if (this.transactionTimerStarted.get())
throw new IllegalStateException(
"Transaction timer is already started");
- BASE_TIMER_INTERVAL = retransmitTimer;
+ baseTimerInterval = retransmitTimer;
// Commented out for Issue 303 since those timers are configured
separately now
-// T4 = 5000 / BASE_TIMER_INTERVAL;
-// T2 = 4000 / BASE_TIMER_INTERVAL;
-// TIMER_D = 32000 / BASE_TIMER_INTERVAL;
+// T4 = 5000 / baseTimerInterval;
+// T2 = 4000 / baseTimerInterval;
+// timerD = 32000 / baseTimerInterval;
}
@@ -1595,7 +1595,7 @@
* @see gov.nist.javax.sip.TransactionExt#getTimerD()
*/
public int getTimerD() {
- return TIMER_D;
+ return timerD;
}
/*
@@ -1622,7 +1622,7 @@
if(interval < 32000) {
throw new IllegalArgumentException("To be RFC 3261 compliant,
the value of Timer D should be at least 32s");
}
- TIMER_D = interval / BASE_TIMER_INTERVAL;
+ timerD = interval / baseTimerInterval;
}
/*
@@ -1630,7 +1630,7 @@
* @see gov.nist.javax.sip.TransactionExt#setTimerT2(int)
*/
public void setTimerT2(int interval) {
- T2 = interval / BASE_TIMER_INTERVAL;
+ T2 = interval / baseTimerInterval;
}
/*
@@ -1638,9 +1638,9 @@
* @see gov.nist.javax.sip.TransactionExt#setTimerT4(int)
*/
public void setTimerT4(int interval) {
- T4 = interval / BASE_TIMER_INTERVAL;
- TIMER_I = T4;
- TIMER_K = T4;
+ T4 = interval / baseTimerInterval;
+ timerI = T4;
+ timerK = T4;
}
=======================================
--- /src/test/tck/msgflow/InviteClientTransactionsStateMachineTest.java Fri
Jul 17 11:59:52 2009
+++ /src/test/tck/msgflow/InviteClientTransactionsStateMachineTest.java Thu
Nov 8 09:44:23 2012
@@ -332,7 +332,7 @@
}
assertTrue(new Exception().getStackTrace()[0].toString(), true);
- // Unfortunately we can't assert the TERMINATED state as TIMER_K
TIMER_D
+ // Unfortunately we can't assert the TERMINATED state as timerK
timerD
// is not exported by JAIN SIP
}
@@ -556,7 +556,7 @@
}
assertTrue(new Exception().getStackTrace()[0].toString(), true);
- // Unfortunately we can't assert the TERMINATED state as TIMER_K
TIMER_D
+ // Unfortunately we can't assert the TERMINATED state as timerK
timerD
// is not exported by JAIN SIP
}
@@ -751,7 +751,7 @@
}
assertTrue(new Exception().getStackTrace()[0].toString(), true);
- // Unfortunately we can't assert the TERMINATED state as TIMER_D
+ // Unfortunately we can't assert the TERMINATED state as timerD
// is not exported by JAIN SIP
}
=======================================
--- /src/test/tck/msgflow/ServerTransactionTest.java Fri Jul 17 11:59:52
2009
+++ /src/test/tck/msgflow/ServerTransactionTest.java Thu Nov 8 09:44:23
2012
@@ -325,7 +325,7 @@
}
assertTrue(new Exception().getStackTrace()[0].toString(), true);
- // Unfortunately we can't assert the TERMINATED state as TIMER_K
TIMER_D
+ // Unfortunately we can't assert the TERMINATED state as timerK
timerD
// is not exported by JAIN SIP
}
=======================================
--- /src/test/unit/gov/nist/javax/sip/stack/DialogIdentityTest.java Mon Mar
19 09:29:48 2012
+++ /src/test/unit/gov/nist/javax/sip/stack/DialogIdentityTest.java Thu
Nov 8 09:44:23 2012
@@ -765,7 +765,9 @@
}
public void stop() {
- this.sipStack.stop();
+ if(sipStack != null) {
+ this.sipStack.stop();
+ }
}
}
@@ -775,7 +777,7 @@
shootme.init();
- Thread.sleep(1000000);
+ Thread.sleep(10000);
shootme.stop();
}
@@ -793,5 +795,5 @@
shootist.stop();
shootme.stop();
-}
+ }
}
==============================================================================
Revision: f93a87efacf1
Author: Jean Deruelle <[email protected]>
Date: Fri Dec 14 07:37:16 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.
http://code.google.com/p/jain-sip/source/detail?r=f93a87efacf1
Modified:
/src/gov/nist/javax/sip/stack/SIPClientTransaction.java
/src/gov/nist/javax/sip/stack/SIPTransaction.java
=======================================
--- /src/gov/nist/javax/sip/stack/SIPClientTransaction.java Thu Nov 8
09:44:23 2012
+++ /src/gov/nist/javax/sip/stack/SIPClientTransaction.java Fri Dec 14
07:37:16 2012
@@ -622,7 +622,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/SIPTransaction.java Thu Nov 8 09:44:23
2012
+++ /src/gov/nist/javax/sip/stack/SIPTransaction.java Fri Dec 14 07:37:16
2012
@@ -191,11 +191,6 @@
*/
public static final TransactionState TERMINATED_STATE =
TransactionState.TERMINATED;
- /**
- * Maximum number of ticks between retransmissions.
- */
- protected static final int MAXIMUM_RETRANSMISSION_TICK_COUNT = 8;
-
// Parent stack for this transaction
protected transient SIPTransactionStack sipStack;
@@ -676,7 +671,7 @@
} else {
// non-INVITE transactions and 3xx-6xx responses are capped at
T2
retransmissionTimerTicksLeft = Math.min(tickCount,
- MAXIMUM_RETRANSMISSION_TICK_COUNT);
+ getTimerT2());
}
retransmissionTimerLastTickCount = retransmissionTimerTicksLeft;
}
