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

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
parent 9f7f0bdc5f 166eeaa1f6
commit 88ec96b600
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-client/src/main/java/org/eclipse/jetty/client/AbstractHttpClientTransport.java
View File

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

5
jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
View File

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