andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix regression in AioCompletionHandler that leads to StackOverflowError

Browse Source
This commit is contained in:
Trustin Lee 2013-02-26 10:19:59 -08:00
parent eb2aa7f6d4
commit 0317baa10d
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
transport/src/main/java/io/netty/channel/aio/AioCompletionHandler.java
View File

@ -35,11 +35,27 @@ public abstract class AioCompletionHandler<V, A extends Channel> implements Comp
*/ */
protected abstract void failed0(Throwable exc, A channel); protected abstract void failed0(Throwable exc, A channel);
private static final int MAX_STACK_DEPTH = 8;
private static final ThreadLocal<Integer> STACK_DEPTH = new ThreadLocal<Integer>() {
@Override
protected Integer initialValue() {
return 0;
}
};
@Override @Override
public final void completed(final V result, final A channel) { public final void completed(final V result, final A channel) {
EventLoop loop = channel.eventLoop(); EventLoop loop = channel.eventLoop();
if (loop.inEventLoop()) { if (loop.inEventLoop()) {
completed0(result, channel); Integer d = STACK_DEPTH.get();
if (d < MAX_STACK_DEPTH) {
STACK_DEPTH.set(d + 1);
try {
completed0(result, channel);
} finally {
STACK_DEPTH.set(d);
}
}
} else { } else {
loop.execute(new Runnable() { loop.execute(new Runnable() {
@Override @Override
@ -54,7 +70,15 @@ public abstract class AioCompletionHandler<V, A extends Channel> implements Comp
public final void failed(final Throwable exc, final A channel) { public final void failed(final Throwable exc, final A channel) {
EventLoop loop = channel.eventLoop(); EventLoop loop = channel.eventLoop();
if (loop.inEventLoop()) { if (loop.inEventLoop()) {
failed0(exc, channel); Integer d = STACK_DEPTH.get();
if (d < MAX_STACK_DEPTH) {
STACK_DEPTH.set(d + 1);
try {
failed0(exc, channel);
} finally {
STACK_DEPTH.set(d);
}
}
} else { } else {
loop.execute(new Runnable() { loop.execute(new Runnable() {
@Override @Override