Revision: 9dd36fa582c2
Author: Jean Deruelle <[email protected]>
Date: Sun Dec 9 04:22:44 2012
Log: Update to latest merge from JAIN SIP
http://code.google.com/p/jain-sip/source/detail?r=9dd36fa582c2&repo=ext
Modified:
/src/main/java/gov/nist/javax/sip/stack/MobicentsSIPClientTransaction.java
/src/main/java/gov/nist/javax/sip/stack/MobicentsSIPServerTransaction.java
=======================================
---
/src/main/java/gov/nist/javax/sip/stack/MobicentsSIPClientTransaction.java
Tue Apr 19 06:38:47 2011
+++
/src/main/java/gov/nist/javax/sip/stack/MobicentsSIPClientTransaction.java
Sun Dec 9 04:22:44 2012
@@ -26,7 +26,7 @@
* @author [email protected]
*
*/
-public class MobicentsSIPClientTransaction extends SIPClientTransaction {
+public class MobicentsSIPClientTransaction extends
SIPClientTransactionImpl {
/**
* @param newSIPStack
=======================================
---
/src/main/java/gov/nist/javax/sip/stack/MobicentsSIPServerTransaction.java
Tue Apr 19 06:38:47 2011
+++
/src/main/java/gov/nist/javax/sip/stack/MobicentsSIPServerTransaction.java
Sun Dec 9 04:22:44 2012
@@ -34,7 +34,7 @@
* @author [email protected]
*
*/
-public class MobicentsSIPServerTransaction extends SIPServerTransaction {
+public class MobicentsSIPServerTransaction extends
SIPServerTransactionImpl {
public MobicentsSIPServerTransaction(SIPTransactionStack sipStack,
MessageChannel newChannelToUse) {
@@ -42,7 +42,7 @@
}
@Override
- protected void map() {
+ public void map() {
if(((SipStackExtension)sipStack).isSendTryingRightAway()) {
sendTryingRightAway();
} else {
@@ -85,7 +85,7 @@
}
@Override
- protected void startTransactionTimer() {
+ public void startTransactionTimer() {
if(!((SipStackExtension)sipStack).isSendTryingRightAway() ||
getLastResponseStatusCode() != 100) {
super.startTransactionTimer();
}
@@ -103,7 +103,7 @@
if (!((SipStackExtension)sipStack).isSendTryingRightAway() &&
this.transactionTimerStarted.get())
throw new IllegalStateException(
"Transaction timer is already started");
- BASE_TIMER_INTERVAL = retransmitTimer;
+ baseTimerInterval = retransmitTimer;
}
}
