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

Removed unused code in DefaultChannelFuture

Browse Source
This commit is contained in:
Trustin Lee 2008-08-19 10:21:04 +00:00
parent 65eda0902d
commit 07e0bf9413
1 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/org/jboss/netty/channel/DefaultChannelFuture.java
View File

@ -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,42 +222,10 @@ 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) {
// Allow only once. // Allow only once.
@ -332,7 +295,6 @@ public class DefaultChannelFuture implements ChannelFuture {
} }
otherListeners = null; otherListeners = null;
} }
} }
} }