6 new revisions:
Revision: 6cbbb8c45d94
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Mon Jun 4 12:42:15 2012
Log: [maven-release-plugin] prepare release jain-sip-ri-1.2.170...
http://code.google.com/p/jain-sip/source/detail?r=6cbbb8c45d94
Revision: 83e7d7becb10
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Mon Jun 4 12:42:34 2012
Log: [maven-release-plugin] prepare for next development iteration...
http://code.google.com/p/jain-sip/source/detail?r=83e7d7becb10
Revision: 21603f8aa910
Author: mranga <mranga@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Tue Jul 3 16:15:04 2012
Log: JSIP-426: Parser error in parsing origin field....
http://code.google.com/p/jain-sip/source/detail?r=21603f8aa910
Revision: 4dc3475f9c03
Author: mranga <mranga@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Tue Jul 3 16:42:11 2012
Log: JSIP-425: UdpMessageChannel incorrectly closed when caching of
Sever C...
http://code.google.com/p/jain-sip/source/detail?r=4dc3475f9c03
Revision: 036a9c8f0923
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Wed Jul 18 08:02:15 2012
Log: Update Issue 8...
http://code.google.com/p/jain-sip/source/detail?r=036a9c8f0923
Revision: ac988b41bf8f
Author: mranga <mranga@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Tue Jul 31 12:09:28 2012
Log: JSIP-428: Fix thread auditor (apply patch supplied by
ywang4074)...
http://code.google.com/p/jain-sip/source/detail?r=ac988b41bf8f
==============================================================================
Revision: 6cbbb8c45d94
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Mon Jun 4 12:42:15 2012
Log: [maven-release-plugin] prepare release jain-sip-ri-1.2.170
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2122
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=6cbbb8c45d94
Modified:
/m2/jain-sip-ri/pom.xml
=======================================
--- /m2/jain-sip-ri/pom.xml Thu May 10 12:41:52 2012
+++ /m2/jain-sip-ri/pom.xml Mon Jun 4 12:42:15 2012
@@ -10,7 +10,7 @@
</parent>
<artifactId>jain-sip-ri</artifactId>
- <version>1.2.X-SNAPSHOT</version>
+ <version>1.2.170</version>
<packaging>jar</packaging>
<name>jain-sip-ri</name>
==============================================================================
Revision: 83e7d7becb10
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Mon Jun 4 12:42:34 2012
Log: [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2123
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=83e7d7becb10
Modified:
/m2/jain-sip-ri/pom.xml
=======================================
--- /m2/jain-sip-ri/pom.xml Mon Jun 4 12:42:15 2012
+++ /m2/jain-sip-ri/pom.xml Mon Jun 4 12:42:34 2012
@@ -10,7 +10,7 @@
</parent>
<artifactId>jain-sip-ri</artifactId>
- <version>1.2.170</version>
+ <version>1.2.X-SNAPSHOT</version>
<packaging>jar</packaging>
<name>jain-sip-ri</name>
==============================================================================
Revision: 21603f8aa910
Author: mranga <mranga@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Tue Jul 3 16:15:04 2012
Log: JSIP-426: Parser error in parsing origin field.
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2124
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=21603f8aa910
Modified:
/src/gov/nist/core/LexerCore.java
/src/gov/nist/javax/sdp/parser/OriginFieldParser.java
=======================================
--- /src/gov/nist/core/LexerCore.java Fri May 4 10:37:24 2012
+++ /src/gov/nist/core/LexerCore.java Tue Jul 3 16:15:04 2012
@@ -42,6 +42,7 @@
public static final int START = 2048;
public static final int END = START + 2048;
// IMPORTANT -- This should be < END
+ public static final int ID_NO_WHITESPACE = END - 3;
public static final int ID = END - 1;
public static final int SAFE = END - 2;
// Individial token classes.
@@ -156,6 +157,10 @@
public String getNextId() {
return ttoken();
}
+
+ public String getNextIdNoWhiteSpace() {
+ return ttokenNoWhiteSpace();
+ }
// call this after you call match
public Token getNextToken() {
@@ -223,6 +228,13 @@
this.currentMatch = new Token();
this.currentMatch.tokenValue = id;
this.currentMatch.tokenType = SAFE;
+ } else if (tok == ID_NO_WHITESPACE) {
+ if (!startsIdNoWhiteSpace())
+ throw new ParseException(buffer + "\nID no white space
expected", ptr);
+ String id = getNextIdNoWhiteSpace();
+ this.currentMatch = new Token();
+ this.currentMatch.tokenValue = id;
+ this.currentMatch.tokenType = ID_NO_WHITESPACE;
} else {
String nexttok = getNextId();
Integer cur = (Integer)
currentLexer.get(nexttok.toUpperCase());
@@ -327,6 +339,15 @@
return false;
}
}
+
+ public boolean startsIdNoWhiteSpace() {
+ try {
+ char nextChar = lookAhead(0);
+ return nextChar != ' ' && nextChar != '\t' && nextChar != '\n';
+ } catch (ParseException ex) {
+ return false;
+ }
+ }
public boolean startsSafeToken() {
try {
@@ -388,46 +409,22 @@
}
}
- /* JvB: unreferenced
- public String ttokenAllowSpace() {
+ public String ttokenNoWhiteSpace() {
int startIdx = ptr;
try {
while (hasMoreChars()) {
char nextChar = lookAhead(0);
- if (isAlphaDigit(nextChar)) {
- consume(1);
- }
- else {
- boolean isValidChar = false;
- switch (nextChar) {
- case '_':
- case '+':
- case '-':
- case '!':
- case '`':
- case '\'':
- case '~':
- case '%': // bug fix by Bruno Konik, JvB copied
here
- case '.':
- case ' ':
- case '\t':
- case '*':
- isValidChar = true;
- }
- if (isValidChar) {
- consume(1);
- }
- else {
- break;
- }
- }
-
- }
- return buffer.substring(startIdx, ptr);
+ if ( nextChar == ' ' || nextChar == '\n' || nextChar
== '\t' ) {
+ break;
+ } else {
+ consume(1);
+ }
+ }
+ return String.valueOf(buffer, startIdx, ptr - startIdx);
} catch (ParseException ex) {
return null;
}
- }*/
+ }
public String ttokenSafe() {
int startIdx = ptr;
=======================================
--- /src/gov/nist/javax/sdp/parser/OriginFieldParser.java Fri Jul 17
11:57:24 2009
+++ /src/gov/nist/javax/sdp/parser/OriginFieldParser.java Tue Jul 3
16:15:04 2012
@@ -49,7 +49,7 @@
lexer.match('=');
lexer.SPorHT();
- lexer.match(LexerCore.SAFE);
+ lexer.match(LexerCore.ID_NO_WHITESPACE);
Token userName = lexer.getNextToken();
originField.setUsername(userName.getTokenValue());
this.lexer.SPorHT();
==============================================================================
Revision: 4dc3475f9c03
Author: mranga <mranga@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Tue Jul 3 16:42:11 2012
Log: JSIP-425: UdpMessageChannel incorrectly closed when caching of
Sever Connections is disabled
Inbox
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2125
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=4dc3475f9c03
Modified:
/src/gov/nist/javax/sip/stack/SIPServerTransaction.java
=======================================
--- /src/gov/nist/javax/sip/stack/SIPServerTransaction.java Wed Mar 21
12:53:59 2012
+++ /src/gov/nist/javax/sip/stack/SIPServerTransaction.java Tue Jul 3
16:42:11 2012
@@ -1988,7 +1988,7 @@
}
// Uncache the server tx
- if ((!sipStack.cacheServerConnections)
+ if ((!sipStack.cacheServerConnections) && isReliable()
&& --getMessageChannel().useCount <= 0) {
// Close the encapsulated socket if stack is configured
close();
==============================================================================
Revision: 036a9c8f0923
Author: deruelle_jean <deruelle_jean@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Wed Jul 18 08:02:15 2012
Log: Update Issue 8
Backporting to trunk
(cherry picked from commit d0ab3c2132c862c6ddee3ca9b493662d65715a66)
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2132
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=036a9c8f0923
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:02:15 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 Fri Apr 6 09:17:42 2012
+++ /src/gov/nist/javax/sip/stack/SIPDialog.java Wed Jul 18 08:02:15 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 Tue Jul 3
16:42:11 2012
+++ /src/gov/nist/javax/sip/stack/SIPServerTransaction.java Wed Jul 18
08:02:15 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 Wed Mar 21 12:53:59
2012
+++ /src/gov/nist/javax/sip/stack/SIPTransaction.java Wed Jul 18 08:02:15
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);
@@ -1660,4 +1661,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 Wed Mar 21
12:53:59 2012
+++ /src/gov/nist/javax/sip/stack/SIPTransactionStack.java Wed Jul 18
08:02:15 2012
@@ -1388,9 +1388,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);
}
==============================================================================
Revision: ac988b41bf8f
Author: mranga <mranga@8e71dc83-d81e-6649-80f2-80b843a9b2be>
Date: Tue Jul 31 12:09:28 2012
Log: JSIP-428: Fix thread auditor (apply patch supplied by ywang4074)
git-svn-id: https://svn.java.net/svn/jsip~svn/trunk@2135
8e71dc83-d81e-6649-80f2-80b843a9b2be
http://code.google.com/p/jain-sip/source/detail?r=ac988b41bf8f
Modified:
/src/gov/nist/javax/sip/stack/UDPMessageChannel.java
=======================================
--- /src/gov/nist/javax/sip/stack/UDPMessageChannel.java Thu Dec 2
14:44:53 2010
+++ /src/gov/nist/javax/sip/stack/UDPMessageChannel.java Tue Jul 31
12:09:28 2012
@@ -59,6 +59,7 @@
import java.net.Socket;
import java.text.ParseException;
import java.util.Hashtable;
+import java.util.concurrent.TimeUnit;
import javax.sip.address.Hop;
import javax.sip.message.Response;
@@ -281,13 +282,25 @@
// Send a heartbeat to the thread auditor
threadHandle.ping();
+
try {
- packet =
udpMessageProcessor.messageQueue.take().packet;
+ DatagramQueuedMessageDispatch work =
udpMessageProcessor.messageQueue.poll(threadHandle
+ .getPingIntervalInMillisecs(),
TimeUnit.MILLISECONDS);
+
+ if (!udpMessageProcessor.isRunning) {
+ return;
+ }
+ if (work == null) {
+ continue;
+ } else {
+ packet = (DatagramPacket)
(work.packet);
+ this.incomingPacket = packet;
+ }
} catch (InterruptedException ex) {
- if (!udpMessageProcessor.isRunning)
- return;
- }
- this.incomingPacket = packet;
+ if (!udpMessageProcessor.isRunning) {
+ return;
+ }
+ }
} else {
packet = this.incomingPacket;
}