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

Remove unnecessary check in DefaultPromise.await0()

Browse Source 
- Fixes #2032
- Fix inspection warnings
This commit is contained in:
Trustin Lee 2013-12-16 15:15:53 +09:00
parent 4302c016d2
commit ee92a12ed5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/io/netty/util/concurrent/DefaultPromise.java
View File

@ -278,6 +278,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
try { try {
wait(); wait();
} catch (InterruptedException e) { } catch (InterruptedException e) {
// Interrupted while waiting.
interrupted = true; interrupted = true;
} finally { } finally {
decWaiters(); decWaiters();
@ -297,6 +298,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
try { try {
return await0(unit.toNanos(timeout), false); return await0(unit.toNanos(timeout), false);
} catch (InterruptedException e) { } catch (InterruptedException e) {
// Should not be raised at all.
throw new InternalError(); throw new InternalError();
} }
} }
@ -306,6 +308,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
try { try {
return await0(MILLISECONDS.toNanos(timeoutMillis), false); return await0(MILLISECONDS.toNanos(timeoutMillis), false);
} catch (InterruptedException e) { } catch (InterruptedException e) {
// Should not be raised at all.
throw new InternalError(); throw new InternalError();
} }
} }
@ -323,7 +326,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
throw new InterruptedException(toString()); throw new InterruptedException(toString());
} }
long startTime = timeoutNanos <= 0 ? 0 : System.nanoTime(); long startTime = System.nanoTime();
long waitTime = timeoutNanos; long waitTime = timeoutNanos;
boolean interrupted = false; boolean interrupted = false;