RESTCOMM-884 : Catch exception for SipMessage.setHeader/addHeader

RestComm · Jun 13, 2017 · f7d004d · f7d004d
1 parent c6636c3
commit f7d004d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java b/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/Call.java
@@ -922,6 +922,8 @@ private void addCustomHeadersToMap(Map<String, String> headers) {
         }
 
         private void addHeadersToMessage(SipServletRequest message, Map<String, String> headers, String keyPrepend) {
+            //NB: for the current limited usage of this function,
+            //we know that no system headers will be modified so we dont need to catch an IAE
             for (Map.Entry<String, String> entry : headers.entrySet()) {
                 String headerName = keyPrepend + entry.getKey();
                 message.addHeader(headerName , entry.getValue());
@@ -1040,11 +1042,17 @@ private void addHeadersToMessage(SipServletRequest message, Map<String, ArrayLis
                         logger.debug("headerName="+headerName+" headerVal="+message.getHeader(headerName)+" concatValue="+sb.toString());
                     }
                     if(!headerName.equalsIgnoreCase("Request-URI")){
-                        String headerVal = message.getHeader(headerName);
-                        if(headerVal!=null && !headerVal.isEmpty()) {
-                            message.setHeader(headerName , headerVal+sb.toString());
-                        }else{
-                            message.addHeader(headerName , sb.toString());
+                        try {
+                            String headerVal = message.getHeader(headerName);
+                            if(headerVal!=null && !headerVal.isEmpty()) {
+                                message.setHeader(headerName , headerVal+sb.toString());
+                            }else{
+                                message.addHeader(headerName , sb.toString());
+                            }
+                        } catch (IllegalArgumentException iae) {
+                            if(logger.isErrorEnabled()) {
+                                logger.error("Exception while setting message header: "+iae.getMessage());
+                            }
                         }
                     }else{
                         //handle Request-URI

diff --git a/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java b/restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java
@@ -639,11 +639,17 @@ private void addHeadersToMessage(SipServletRequest message, Map<String, ArrayLis
                     logger.debug("headerName="+headerName+" headerVal="+message.getHeader(headerName)+" concatValue="+sb.toString());
                 }
                 if(!headerName.equalsIgnoreCase("Request-URI")){
-                    String headerVal = message.getHeader(headerName);
-                    if(headerVal!=null && !headerVal.isEmpty()) {
-                        message.setHeader(headerName , headerVal+sb.toString());
-                    }else{
-                        message.addHeader(headerName , sb.toString());
+                    try {
+                        String headerVal = message.getHeader(headerName);
+                        if(headerVal!=null && !headerVal.isEmpty()) {
+                            message.setHeader(headerName , headerVal+sb.toString());
+                        }else{
+                            message.addHeader(headerName , sb.toString());
+                        }
+                    } catch (IllegalArgumentException iae) {
+                        if(logger.isErrorEnabled()) {
+                            logger.error("Exception while setting message header: "+iae.getMessage());
+                        }
                     }
                 }else{
                     //handle Request-URI