Minor fixes.

thboileau · thboileau · commit 05773e27df24 · 2015-06-20T14:11:14.000+02:00
diff --git a/modules/org.restlet/src/org/restlet/engine/adapter/Call.java b/modules/org.restlet/src/org/restlet/engine/adapter/Call.java
@@ -52,13 +52,21 @@ public abstract class Call {
     public static boolean isBroken(Throwable exception) {
         boolean result = false;
 
-        if (exception.getMessage() != null) {
-            result = (exception.getMessage().indexOf("Broken pipe") != -1)
-                    || (exception
-                            .getMessage()
-                            .equals("An existing connection must have been closed by the remote party.") || (exception
-                            .getMessage()
-                            .equals("An open connection has been abandonned by your network stack.")));
+        // detect Tomcat and Jetty exceptions
+        if (exception instanceof IOException) {
+            String exceptionName = exception.getClass().getName();
+            result = (exceptionName.endsWith("ClientAbortException") ||
+                exceptionName.endsWith("jetty.io.EofException"));
+        }
+
+        // check for known exception messages
+        if (!result) {
+            String exceptionMessage = exception.getMessage();
+            if (exceptionMessage != null) {
+                result = (exceptionMessage.indexOf("Broken pipe") != -1) ||
+                    (exceptionMessage.equals("An existing connection must have been closed by the remote party.") ||
+                        (exceptionMessage.equals("An open connection has been abandonned by your network stack.")));
+            }
         }
 
         if (!result && exception.getCause() != null) {
diff --git a/modules/org.restlet/src/org/restlet/engine/adapter/ServerAdapter.java b/modules/org.restlet/src/org/restlet/engine/adapter/ServerAdapter.java
@@ -104,7 +104,7 @@ protected void addResponseHeaders(HttpResponse response) {
     /**
      * Commits the changes to a handled uniform call back into the original HTTP
      * call. The default implementation first invokes the "addResponseHeaders"
-     * then asks the "httpCall" to send the response back to the client.
+     * then asks the "htppCall" to send the response back to the client.
      * 
      * @param response
      *            The high-level response.
@@ -188,10 +188,8 @@ public void commit(HttpResponse response) {
         } catch (Throwable t) {
             // [ifndef gae]
             if (response.getHttpCall().isConnectionBroken(t)) {
-                getLogger()
-                        .log(Level.INFO,
-                                "The connection was broken. It was probably closed by the client.",
-                                t);
+                // output a single log line for this common case to avoid filling servers logs
+                getLogger().log(Level.INFO, "The connection was broken. It was probably closed by the client. Reason: " + t.getMessage());
             } else
             // [enddef]
             {
diff --git a/modules/org.restlet/src/org/restlet/engine/resource/MethodAnnotationInfo.java b/modules/org.restlet/src/org/restlet/engine/resource/MethodAnnotationInfo.java
@@ -38,6 +38,7 @@
 import org.restlet.data.Metadata;
 import org.restlet.data.Method;
 import org.restlet.data.Parameter;
+import org.restlet.engine.util.StringUtils;
 import org.restlet.representation.Representation;
 import org.restlet.representation.Variant;
 import org.restlet.service.MetadataService;
@@ -80,7 +81,7 @@ public MethodAnnotationInfo(Class<?> javaClass, Method restletMethod,
         this.restletMethod = restletMethod;
 
         // Parse the main components of the annotation value
-        if ((annotationValue != null) && !annotationValue.equals("")) {
+        if (!StringUtils.isNullOrEmpty(annotationValue)) {
             int queryIndex = annotationValue.indexOf('?');
 
             if (queryIndex != -1) {
@@ -288,6 +289,7 @@ private List<Variant> getVariants(MetadataService metadataService,
         List<Variant> result = null;
 
         if (annotationValue != null) {
+
             StringTokenizer stValue = new StringTokenizer(annotationValue,
                     "\\|");
             while (stValue.hasMoreTokens()) {
@@ -305,6 +307,7 @@ private List<Variant> getVariants(MetadataService metadataService,
                     if (extension == null) {
                         continue;
                     }
+
                     List<Metadata> metadataList = metadataService
                             .getAllMetadata(extension);
 
