Merge pull request #2220 from yahoo/bjorncs/remove-netty-usage

Remove some netty usage in jdisc_http_service

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
+}