Merged branch 'jetty-9.4.x' into 'master'.

2017-10-06 09:03:48 +02:00 · 2017-10-06 09:03:48 +02:00 · 77c479d6fb
parent 6b51caa2af b626dbdd16
commit 77c479d6fb
1 changed files with 2 additions and 1 deletions
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@ -391,7 +391,8 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
                            }
                            else
                            {
-                                failure.addSuppressed(x);
+                                if (failure != x)
+                                    failure.addSuppressed(x);
                                minimalErrorResponse(failure);
                            }
                        }