Removed unused code in DefaultChannelFuture
This commit is contained in:
parent
65eda0902d
commit
07e0bf9413
@ -42,7 +42,6 @@ public class DefaultChannelFuture implements ChannelFuture {
|
|||||||
private static final InternalLogger logger =
|
private static final InternalLogger logger =
|
||||||
InternalLoggerFactory.getInstance(DefaultChannelFuture.class);
|
InternalLoggerFactory.getInstance(DefaultChannelFuture.class);
|
||||||
|
|
||||||
private static final int DEAD_LOCK_CHECK_INTERVAL = 5000;
|
|
||||||
private static final Throwable CANCELLED = new Throwable();
|
private static final Throwable CANCELLED = new Throwable();
|
||||||
|
|
||||||
private final Channel channel;
|
private final Channel channel;
|
||||||
@ -142,8 +141,7 @@ public class DefaultChannelFuture implements ChannelFuture {
|
|||||||
while (!done) {
|
while (!done) {
|
||||||
waiters++;
|
waiters++;
|
||||||
try {
|
try {
|
||||||
this.wait(DEAD_LOCK_CHECK_INTERVAL);
|
this.wait();
|
||||||
checkDeadLock();
|
|
||||||
} finally {
|
} finally {
|
||||||
waiters--;
|
waiters--;
|
||||||
}
|
}
|
||||||
@ -166,14 +164,11 @@ public class DefaultChannelFuture implements ChannelFuture {
|
|||||||
while (!done) {
|
while (!done) {
|
||||||
waiters++;
|
waiters++;
|
||||||
try {
|
try {
|
||||||
this.wait(DEAD_LOCK_CHECK_INTERVAL);
|
this.wait();
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
// Ignore.
|
// Ignore.
|
||||||
} finally {
|
} finally {
|
||||||
waiters--;
|
waiters--;
|
||||||
if (!done) {
|
|
||||||
checkDeadLock();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -208,7 +203,7 @@ public class DefaultChannelFuture implements ChannelFuture {
|
|||||||
try {
|
try {
|
||||||
for (;;) {
|
for (;;) {
|
||||||
try {
|
try {
|
||||||
this.wait(Math.min(waitTime, DEAD_LOCK_CHECK_INTERVAL));
|
this.wait(waitTime);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
if (interruptable) {
|
if (interruptable) {
|
||||||
throw e;
|
throw e;
|
||||||
@ -227,41 +222,9 @@ public class DefaultChannelFuture implements ChannelFuture {
|
|||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
waiters--;
|
waiters--;
|
||||||
if (!done) {
|
|
||||||
checkDeadLock();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private void checkDeadLock() {
|
|
||||||
// IllegalStateException e = new IllegalStateException(
|
|
||||||
// "DEAD LOCK: " + ChannelFuture.class.getSimpleName() +
|
|
||||||
// ".await() was invoked from an I/O processor thread. " +
|
|
||||||
// "Please use " + ChannelFutureListener.class.getSimpleName() +
|
|
||||||
// " or configure a proper thread model alternatively.");
|
|
||||||
//
|
|
||||||
// StackTraceElement[] stackTrace = e.getStackTrace();
|
|
||||||
//
|
|
||||||
// // Simple and quick check.
|
|
||||||
// for (StackTraceElement s: stackTrace) {
|
|
||||||
// if (AbstractPollingIoProcessor.class.getName().equals(s.getClassName())) {
|
|
||||||
// throw e;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // And then more precisely.
|
|
||||||
// for (StackTraceElement s: stackTrace) {
|
|
||||||
// try {
|
|
||||||
// Class<?> cls = DefaultChannelFuture.class.getClassLoader().loadClass(s.getClassName());
|
|
||||||
// if (IoProcessor.class.isAssignableFrom(cls)) {
|
|
||||||
// throw e;
|
|
||||||
// }
|
|
||||||
// } catch (Exception cnfe) {
|
|
||||||
// // Ignore
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setSuccess() {
|
public void setSuccess() {
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
@ -332,7 +295,6 @@ public class DefaultChannelFuture implements ChannelFuture {
|
|||||||
}
|
}
|
||||||
otherListeners = null;
|
otherListeners = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user