Merge branch 'master' of https://github.com/RestComm/jain-sip

RestComm · Nov 14, 2017 · bf35572 · bf35572
2 parents ae1fe0d + b4f0acb
commit bf35572
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/gov/nist/javax/sip/message/SIPMessage.java b/src/gov/nist/javax/sip/message/SIPMessage.java
@@ -1631,13 +1631,12 @@ public void addUnparsed(String unparsed) {
      */
 
     public void addHeader(String sipHeader) {
-        String hdrString = sipHeader.trim() + "\n";
         try {
-            HeaderParser parser = ParserFactory.createParser(sipHeader);
+            HeaderParser parser = ParserFactory.createParser(sipHeader + "\n");
             SIPHeader sh = parser.parse();
             this.attachHeader(sh, false);
         } catch (ParseException ex) {
-            this.getUnrecognizedHeadersList().add(hdrString);
+            this.getUnrecognizedHeadersList().add(sipHeader);
         }
     }
 

diff --git a/src/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java b/src/gov/nist/javax/sip/stack/SIPClientTransactionImpl.java
@@ -51,13 +51,6 @@
 import gov.nist.javax.sip.message.SIPResponse;
 import gov.nist.javax.sip.stack.IllegalTransactionStateException.Reason;
 
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ListIterator;
-import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import javax.sip.Dialog;
 import javax.sip.DialogState;
 import javax.sip.InvalidArgumentException;
@@ -72,6 +65,12 @@
 import javax.sip.header.RouteHeader;
 import javax.sip.header.TimeStampHeader;
 import javax.sip.message.Request;
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.ListIterator;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /*
  * Jeff Keyser -- initial. Daniel J. Martinez Manzano --Added support for TLS message channel.

diff --git a/src/gov/nist/javax/sip/stack/timers/AffinitityExecutorSipTimer.java b/src/gov/nist/javax/sip/stack/timers/AffinitityExecutorSipTimer.java
@@ -139,7 +139,7 @@ public void run() {
 	 * @see gov.nist.javax.sip.stack.timers.SipTimer#isStarted()
 	 */
 	public boolean isStarted() {
-		return threadPoolExecutor.isTerminated();
+		return !threadPoolExecutor.isShutdown();
 	}
 
 }
diff --git a/src/gov/nist/javax/sip/stack/timers/ScheduledExecutorSipTimer.java b/src/gov/nist/javax/sip/stack/timers/ScheduledExecutorSipTimer.java
@@ -166,7 +166,7 @@ public void run() {
 	 * @see gov.nist.javax.sip.stack.timers.SipTimer#isStarted()
 	 */
 	public boolean isStarted() {
-		return threadPoolExecutor.isTerminated();
+		return !threadPoolExecutor.isShutdown();
 	}
 
 }