Further error handling improvements

Author: markt-asf

java/org/apache/catalina/ha/backend/LocalStrings.properties

@@ -25,6 +25,8 @@ multiCastSender.multiCastFailed=Unable to use multicast
 multiCastSender.sendFailed=Unable to send multicast message
 
 tcpSender.connectionFailed=Unable to connect to proxy
+tcpSender.invalidContentLength=Unable to parse content length [{0}]
+tcpSender.invalidHeaderLine=Unable to parse header line [{0}]
 tcpSender.invalidProxyList=Invalid proxy list
 tcpSender.notInitialized=Not initialized
 tcpSender.readError=Error reading response content

java/org/apache/catalina/ha/backend/TcpSender.java

@@ -177,7 +177,7 @@ public int send(String mess) throws Exception {
                     // Ignore
                 }
                 if (status != 200) {
-                    log.error(sm.getString("tcpSender.responseErrorCode", Integer.valueOf(status)));
+                    log.error(sm.getString("tcpSender.responseErrorCode", responseStatus));
                     close(i);
                     continue;
                 }
@@ -191,8 +191,20 @@ public int send(String mess) throws Exception {
                         String headerName = header.substring(0, colon).trim();
                         String headerValue = header.substring(colon + 1).trim();
                         if ("content-length".equalsIgnoreCase(headerName)) {
-                            contentLength = Integer.parseInt(headerValue);
+                            try {
+                                contentLength = Integer.parseInt(headerValue);
+                            } catch (NumberFormatException e) {
+                                log.error(sm.getString("tcpSender.invalidContentLength", headerValue));
+                                close(i);
+                                break;
+                            }
                         }
+                    } else {
+                        log.error(sm.getString("tcpSender.invalidHeaderLine", header));
+                        close(i);
+                        // Clear any content length if one has been read.
+                        contentLength = 0;
+                        break;
                     }
                     header = connectionReaders[i].readLine();
                 }