Fix for usnistgov#53 Issue usnistgov#53

vladimirralev · Jan 6, 2020 · b586569 · b586569
1 parent 79e3788
commit b586569
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/gov/nist/javax/sip/header/SIPHeaderList.java b/src/gov/nist/javax/sip/header/SIPHeaderList.java
@@ -498,17 +498,22 @@ protected String encodeBody() {
 
     protected StringBuilder encodeBody(StringBuilder buffer) {
         ListIterator<HDR> iterator = this.listIterator();
+
         while (true) {
             SIPHeader sipHeader = (SIPHeader) iterator.next();
             if ( sipHeader == this ) throw new RuntimeException ("Unexpected circularity in SipHeaderList");
+            int buffPosDelta = buffer.length();
             sipHeader.encodeBody(buffer);
+            buffPosDelta -= buffer.length();
             // if (body.equals("")) System.out.println("BODY == ");
             if (iterator.hasNext()) {
-                if (!this.headerName.equals(PrivacyHeader.NAME))
-                    buffer.append(Separators.COMMA);
-                else
-                    buffer.append(Separators.SEMICOLON);
-                continue;
+            	if(buffPosDelta != 0) {
+            		if (!this.headerName.equals(PrivacyHeader.NAME))
+            			buffer.append(Separators.COMMA);
+            		else
+            			buffer.append(Separators.SEMICOLON);
+            		continue;
+            	}
             } else
                 break;