summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2017-04-21 15:27:02 +0200
committerGitHub <noreply@github.com>2017-04-21 15:27:02 +0200
commite6079fa5fbf8143b266add48d6672b7bf4b7974a (patch)
treebe5c985c0cb2d46de0382ce54ca8479f02ac8b22 /application
parent2d62cda1a75a2aeb6bdd5652a62f8f8aacbde06e (diff)
Revert "Remove some netty usage in jdisc_http_service"
Diffstat (limited to 'application')
-rw-r--r--application/src/main/java/com/yahoo/application/Application.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/application/src/main/java/com/yahoo/application/Application.java b/application/src/main/java/com/yahoo/application/Application.java
index 5b91c8ff89c..cfcce72487b 100644
--- a/application/src/main/java/com/yahoo/application/Application.java
+++ b/application/src/main/java/com/yahoo/application/Application.java
@@ -20,6 +20,7 @@ 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;
@@ -315,7 +316,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().getCause() != null && e.getCause().getCause() instanceof BindException) {
+ if (e.getCause() != null && e.getCause() instanceof ChannelException && 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 {
@@ -666,4 +667,4 @@ public final class Application implements AutoCloseable {
}
}
}
-}
+} \ No newline at end of file