diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-04-21 13:37:41 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-04-24 22:00:35 +0200 |
commit | 086bac8f8df7f63a727ee0b7541f5d0cd09dc9a9 (patch) | |
tree | 5698466ab974a95f0acd0c4626f4c92a7c9cc333 /application/src/main/java/com | |
parent | d646299293525c074f318eb57aa8c948204d558e (diff) |
Remove some netty usage in jdisc_http_service
Diffstat (limited to 'application/src/main/java/com')
-rw-r--r-- | application/src/main/java/com/yahoo/application/Application.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java index cfcce72487b..5b91c8ff89c 100644 --- a/application/src/main/java/com/yahoo/application/Application.java +++ b/application/src/main/java/com/yahoo/application/Application.java @@ -20,7 +20,6 @@ import com.yahoo.search.rendering.Renderer; import com.yahoo.text.StringUtilities; import com.yahoo.text.Utf8; import com.yahoo.vespa.model.VespaModel; -import org.jboss.netty.channel.ChannelException; import org.xml.sax.SAXException; import java.io.File; @@ -316,7 +315,7 @@ public final class Application implements AutoCloseable { break; } catch (Error e) { // the container thinks this is really serious, in this case is it not in the cause is a BindException // catch bind error and reset container - if (e.getCause() != null && e.getCause() instanceof ChannelException && e.getCause().getCause() != null && e.getCause().getCause() instanceof BindException) { + if (e.getCause() != null && e.getCause().getCause() != null && e.getCause().getCause() instanceof BindException) { exception = (Exception) e.getCause().getCause(); com.yahoo.container.Container.resetInstance(); // this is needed to be able to recreate the container from config again } else { @@ -667,4 +666,4 @@ public final class Application implements AutoCloseable { } } } -}
\ No newline at end of file +} |