svn commit: r1552673 - /tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java

[an...@apache.org]

Author: andygumbrecht
Date: Fri Dec 20 13:54:49 2013
New Revision: 1552673

URL: http://svn.apache.org/r1552673
Log:
Only log SocketException at debug level

Modified:
    tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java

Modified: tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java?rev=1552673&r1=1552672&r2=1552673&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java (original)
+++ tomee/tomee/trunk/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/OpenEJBHttpServer.java Fri Dec 20 13:54:49 2013
@@ -39,6 +39,7 @@ import java.io.OutputStream;
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.net.Socket;
+import java.net.SocketException;
 import java.net.URI;
 import java.util.Map;
 import java.util.Properties;
@@ -204,7 +205,16 @@ public class OpenEJBHttpServer implement
                     }
                 }
             } catch (Throwable t2) {
-                log.error("Could not write response", t2);
+
+                if (log.isDebugEnabled()) {
+                    log.debug("Could not write response", t2);
+                } else {
+                    //SocketException is something a client can cause, so do not log it (potential DOS)
+                    if (!SocketException.class.isInstance(t2)) {
+                        log.warning("Could not write response:" + t2);
+                    }
+                }
+
             }
         }
     }
@@ -257,8 +267,9 @@ public class OpenEJBHttpServer implement
     }
 
     public static String reformat(final String raw) {
-        if (raw.length() == 0)
+        if (raw.length() == 0) {
             return raw;
+        }
 
         try {
             final TransformerFactory factory = TransformerFactory.newInstance();