Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x

This commit is contained in:
Greg Wilkins 2018-10-05 18:37:18 +10:00
commit 88ec96b600
2 changed files with 5 additions and 1 deletions

View File

@ -135,6 +135,7 @@ public abstract class AbstractHttpClientTransport extends ContainerLifeCycle imp
catch (IOException xx)
{
LOG.ignore(xx);
x.addSuppressed(xx);
}
finally
{

View File

@ -258,11 +258,14 @@ public class ManagedSelector extends AbstractLifeCycle implements Runnable, Dump
}
catch (Throwable x)
{
closeNoExceptions(_selector);
if (isRunning())
LOG.warn(x);
else
{
LOG.warn(x.toString());
LOG.debug(x);
}
closeNoExceptions(_selector);
}
return false;
}