Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

439067 Improved graceful stop timeout handling

This commit is contained in:
Greg Wilkins 2014-07-19 00:46:19 +10:00
parent d580c3279b
commit b38a978eac
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
View File

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

4
jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java
View File

@ -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();

5
jetty-util/src/main/java/org/eclipse/jetty/util/MultiException.java
View File

@ -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)
{