summaryrefslogtreecommitdiffstats
path: root/application/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-04-21 13:37:41 +0200
committerBjørn Christian Seime <bjorncs@yahoo-inc.com>2017-04-21 13:49:42 +0200
commit30cd1687c29f6159d799e859ba8c6cb4d74c381e (patch)
tree8d469acb2862c8198ecc5070a0746396ef45a6fc /application/src
parent4077f420c5fb5f6d2dcbd42bbd6bc2bf6c40094b (diff)
Remove some netty usage in jdisc_http_service
Diffstat (limited to 'application/src')
-rw-r--r--application/src/main/java/com/yahoo/application/Application.java5
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
+}