Skip to content
This repository was archived by the owner on Mar 13, 2021. It is now read-only.

Commit 2ccbbba

Browse files
committed
Address review comments
1 parent 439f767 commit 2ccbbba

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/main/java/io/projectriff/invoker/server/GrpcServerAdapter.java

+10-4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import reactor.core.publisher.GroupedFlux;
2222
import reactor.core.publisher.Operators;
2323
import reactor.core.publisher.Signal;
24+
import reactor.util.context.Context;
2425
import reactor.util.function.Tuple2;
2526
import reactor.util.function.Tuples;
2627

@@ -149,8 +150,8 @@ private Function<Flux<Tuple2<Integer, Message<byte[]>>>, Flux<Tuple2<Integer, Me
149150
// Used to transform the publisher chain into one that doesn't forward cancel() calls once it has complete()d.
150151
private Function<? super Publisher<Tuple2<Integer, Message<byte[]>>>, ? extends Publisher<Tuple2<Integer, Message<byte[]>>>> ignoreCancelsAfterComplete() {
151152
return Operators.lift((f, actual) ->
152-
new CoreSubscriber<>() {
153-
AtomicBoolean completed = new AtomicBoolean();
153+
new CoreSubscriber<Tuple2<Integer, Message<byte[]>>>() {
154+
private volatile boolean completed;
154155

155156
@Override
156157
public void onSubscribe(Subscription s) {
@@ -162,7 +163,7 @@ public void request(long n) {
162163

163164
@Override
164165
public void cancel() {
165-
if (!completed.get()) {
166+
if (!completed) {
166167
s.cancel();
167168
}
168169
}
@@ -181,9 +182,14 @@ public void onError(Throwable t) {
181182

182183
@Override
183184
public void onComplete() {
184-
completed.compareAndSet(false, true);
185+
completed = true;
185186
actual.onComplete();
186187
}
188+
189+
@Override
190+
public Context currentContext() {
191+
return actual.currentContext();
192+
}
187193
});
188194
}
189195

0 commit comments

Comments
 (0)