439067 Improved graceful stop timeout handling

jetty-server/src/main/java/org/eclipse/jetty/server/Server.java

@@ -419,7 +419,7 @@ public class Server extends HandlerWrapper implements Attributes
                 }
                 catch (Exception e)
                 {
-                    mex.add(e.getCause());
+                    mex.add(e);
                 }
             }
         }

jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java

@@ -30,6 +30,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.server.handler.AbstractHandler;
 import org.eclipse.jetty.server.handler.StatisticsHandler;
 import org.eclipse.jetty.util.IO;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.StdErrLog;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Before;
@@ -96,7 +98,7 @@ public class GracefulStopTest
                 }
                 catch (Exception e)
                 {
-                    e.printStackTrace();
+                    //e.printStackTrace();
                 }
             }
         }.start();

jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java

@@ -43,10 +43,11 @@ public class MultiException extends Exception
     /* ------------------------------------------------------------ */
     public void add(Throwable e)
     {
+        if (e==null)
+            throw new IllegalArgumentException();
+        
         if(nested == null)
-        {
             nested = new ArrayList<>();
-        }
         
         if (e instanceof MultiException)
         {