From e6db2bd0a34186a3f1f13ef7dd55ebe2cd367c93 Mon Sep 17 00:00:00 2001 From: Stephane Landelle Date: Fri, 20 Feb 2015 17:58:21 +0100 Subject: [PATCH] Rename StackTraceInspector methods --- .../commons/future/StackTraceInspector.java | 16 ++++++++-------- .../providers/netty3/handler/Processor.java | 2 +- .../netty3/request/NettyConnectListener.java | 2 +- .../netty3/request/ProgressListener.java | 2 +- .../providers/netty4/handler/Processor.java | 2 +- .../netty4/request/NettyConnectListener.java | 2 +- .../netty4/request/ProgressListener.java | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/providers/netty-commons/src/main/java/org/asynchttpclient/providers/netty/commons/future/StackTraceInspector.java b/providers/netty-commons/src/main/java/org/asynchttpclient/providers/netty/commons/future/StackTraceInspector.java index 276fb0a1c5..6a5ee3a64a 100755 --- a/providers/netty-commons/src/main/java/org/asynchttpclient/providers/netty/commons/future/StackTraceInspector.java +++ b/providers/netty-commons/src/main/java/org/asynchttpclient/providers/netty/commons/future/StackTraceInspector.java @@ -25,22 +25,22 @@ private static boolean exceptionInMethod(Throwable t, String className, String m return false; } - private static boolean abortOnConnectCloseException(Throwable t) { + private static boolean recoverOnConnectCloseException(Throwable t) { return exceptionInMethod(t, "sun.nio.ch.SocketChannelImpl", "checkConnect") - || (t.getCause() != null && abortOnConnectCloseException(t.getCause())); + || (t.getCause() != null && recoverOnConnectCloseException(t.getCause())); } - public static boolean abortOnNetty3DisconnectException(Throwable t) { + public static boolean recoverOnNetty3DisconnectException(Throwable t) { return exceptionInMethod(t, "io.netty.handler.ssl.SslHandler", "disconnect") - || (t.getCause() != null && abortOnConnectCloseException(t.getCause())); + || (t.getCause() != null && recoverOnConnectCloseException(t.getCause())); } - public static boolean abortOnNetty4DisconnectException(Throwable t) { + public static boolean recoverOnNetty4DisconnectException(Throwable t) { return exceptionInMethod(t, "io.netty.handler.ssl.SslHandler", "disconnect") - || (t.getCause() != null && abortOnConnectCloseException(t.getCause())); + || (t.getCause() != null && recoverOnConnectCloseException(t.getCause())); } - public static boolean abortOnReadOrWriteException(Throwable t) { + public static boolean recoverOnReadOrWriteException(Throwable t) { try { for (StackTraceElement element : t.getStackTrace()) { @@ -53,7 +53,7 @@ public static boolean abortOnReadOrWriteException(Throwable t) { } if (t.getCause() != null) - return abortOnReadOrWriteException(t.getCause()); + return recoverOnReadOrWriteException(t.getCause()); return false; } diff --git a/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/handler/Processor.java b/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/handler/Processor.java index ffe23a02fd..76422a1be5 100644 --- a/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/handler/Processor.java +++ b/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/handler/Processor.java @@ -158,7 +158,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) throws } // FIXME how does recovery occur?! - if (StackTraceInspector.abortOnReadOrWriteException(cause)) { + if (StackTraceInspector.recoverOnReadOrWriteException(cause)) { LOGGER.debug("Trying to recover from dead Channel: {}", channel); return; } diff --git a/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/NettyConnectListener.java b/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/NettyConnectListener.java index 611869036e..3aa4da58d1 100644 --- a/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/NettyConnectListener.java +++ b/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/NettyConnectListener.java @@ -91,7 +91,7 @@ private void onFutureFailure(Channel channel, Throwable cause) { LOGGER.debug("Trying to recover from failing to connect channel {} with a retry value of {} ", channel, canRetry); if (canRetry && cause != null - && (cause instanceof ClosedChannelException || future.getState() != NettyResponseFuture.STATE.NEW || StackTraceInspector.abortOnNetty3DisconnectException(cause))) { + && (cause instanceof ClosedChannelException || future.getState() != NettyResponseFuture.STATE.NEW || StackTraceInspector.recoverOnNetty3DisconnectException(cause))) { if (!requestSender.retry(future)) return; diff --git a/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/ProgressListener.java b/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/ProgressListener.java index 43d142157e..92f8e22f9d 100644 --- a/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/ProgressListener.java +++ b/providers/netty3/src/main/java/org/asynchttpclient/providers/netty3/request/ProgressListener.java @@ -51,7 +51,7 @@ private boolean abortOnThrowable(Throwable cause, Channel channel) { if (cause != null && future.getState() != NettyResponseFuture.STATE.NEW) { // The write operation failed. If the channel was cached, it means it got asynchronously closed. // Let's retry a second time. - if (cause instanceof IllegalStateException || cause instanceof ClosedChannelException || StackTraceInspector.abortOnReadOrWriteException(cause)) { + if (cause instanceof IllegalStateException || cause instanceof ClosedChannelException || StackTraceInspector.recoverOnReadOrWriteException(cause)) { LOGGER.debug(cause == null ? "" : cause.getMessage(), cause); Channels.silentlyCloseChannel(channel); diff --git a/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/Processor.java b/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/Processor.java index 19c20f8ee1..0cbb774e4a 100755 --- a/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/Processor.java +++ b/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/handler/Processor.java @@ -141,7 +141,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, Throwable e) throws Excep } } - if (StackTraceInspector.abortOnReadOrWriteException(cause)) { + if (StackTraceInspector.recoverOnReadOrWriteException(cause)) { LOGGER.debug("Trying to recover from dead Channel: {}", channel); return; } diff --git a/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyConnectListener.java b/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyConnectListener.java index 3e8fc9b2ea..0f49a214a4 100755 --- a/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyConnectListener.java +++ b/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/NettyConnectListener.java @@ -89,7 +89,7 @@ private void onFutureFailure(Channel channel, Throwable cause) { LOGGER.debug("Trying to recover from failing to connect channel {} with a retry value of {} ", channel, canRetry); if (canRetry// && cause != null// - && (cause instanceof ClosedChannelException || future.getState() != NettyResponseFuture.STATE.NEW || StackTraceInspector.abortOnNetty4DisconnectException(cause))) { + && (cause instanceof ClosedChannelException || future.getState() != NettyResponseFuture.STATE.NEW || StackTraceInspector.recoverOnNetty4DisconnectException(cause))) { if (requestSender.retry(future)) { return; diff --git a/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/ProgressListener.java b/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/ProgressListener.java index 4715117d2a..7afe90a13f 100755 --- a/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/ProgressListener.java +++ b/providers/netty4/src/main/java/org/asynchttpclient/providers/netty4/request/ProgressListener.java @@ -55,7 +55,7 @@ public ProgressListener(AsyncHttpClientConfig config,// private boolean abortOnThrowable(Throwable cause, Channel channel) { if (cause != null && future.getState() != NettyResponseFuture.STATE.NEW) { - if (cause instanceof IllegalStateException || cause instanceof ClosedChannelException || StackTraceInspector.abortOnReadOrWriteException(cause)) { + if (cause instanceof IllegalStateException || cause instanceof ClosedChannelException || StackTraceInspector.recoverOnReadOrWriteException(cause)) { LOGGER.debug(cause.getMessage(), cause); Channels.silentlyCloseChannel(channel);