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

Revert "DefaultPromise make listeners not volatile"

Browse Source 
This reverts commit 4d8132ff24 as I missed something I want to discuss first.
This commit is contained in:
Norman Maurer 2016-07-07 08:37:41 +02:00
parent 4d8132ff24
commit 6492cb98b2
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionHandlerTest.java
View File

@ -27,7 +27,6 @@ import io.netty.channel.DefaultChannelPromise;
import io.netty.util.ReferenceCountUtil;
import io.netty.util.concurrent.EventExecutor;
import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.concurrent.ImmediateEventExecutor;
import io.netty.util.concurrent.Promise;
import org.junit.After;
import org.junit.Before;
@ -125,7 +124,7 @@ public class Http2ConnectionHandlerTest {
public void setup() throws Exception {
MockitoAnnotations.initMocks(this);
promise = new DefaultChannelPromise(channel, ImmediateEventExecutor.INSTANCE);
promise = new DefaultChannelPromise(channel);
Throwable fakeException = new RuntimeException("Fake exception");
when(encoder.connection()).thenReturn(connection);

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

@ -60,7 +60,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
*
* Threading - synchronized(this). We must support adding listeners when there is no EventExecutor.
*/
private Object listeners;
private volatile Object listeners;
/**
* Threading - synchronized(this). We are required to hold the monitor to use Java's underlying wait()/notifyAll().
*/
@ -417,6 +417,13 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
}
private void notifyListeners() {
if (listeners == null) {
return;
}
notifyListenersWithStackOverFlowProtection();
}
private void notifyListenersWithStackOverFlowProtection() {
EventExecutor executor = executor();
if (executor.inEventLoop()) {
final InternalThreadLocalMap threadLocals = InternalThreadLocalMap.get();
@ -441,7 +448,7 @@ public class DefaultPromise<V> extends AbstractFuture<V> implements Promise<V> {
}
/**
* The logic in this method should be identical to {@link #notifyListeners()} but
* The logic in this method should be identical to {@link #notifyListenersWithStackOverFlowProtection()} but
* cannot share code because the listener(s) cannot be cached for an instance of {@link DefaultPromise} since the
* listener(s) may be changed and is protected by a synchronized operation.
*/