Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import java.util.concurrent.Flow;
import java.util.concurrent.Flow.Subscription;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;

import io.smallrye.mutiny.Context;
import io.smallrye.mutiny.infrastructure.Infrastructure;
Expand All @@ -23,16 +23,21 @@

@Override
public void subscribe(UniSubscriber<? super T> subscriber) {
new PublisherSubscriber(subscriber).forward();
new PublisherSubscriber(publisher, subscriber).forward();
}

private class PublisherSubscriber implements UniSubscription, Flow.Subscriber<T>, ContextSupport {
private static class PublisherSubscriber<T> implements UniSubscription, Flow.Subscriber<T>, ContextSupport {

private final UniSubscriber<? super T> subscriber;
AtomicReference<Subscription> subscription = new AtomicReference<>();
private final Flow.Publisher<? extends T> publisher;

private PublisherSubscriber(UniSubscriber<? super T> subscriber) {
private volatile Subscription subscription;
private static final AtomicReferenceFieldUpdater<PublisherSubscriber, Subscription> SUBSCRIPTION_UPDATER = AtomicReferenceFieldUpdater
.newUpdater(PublisherSubscriber.class, Subscription.class, "subscription");

private PublisherSubscriber(Flow.Publisher<? extends T> publisher, UniSubscriber<? super T> subscriber) {
this.subscriber = subscriber;
this.publisher = publisher;
}

private void forward() {
Expand All @@ -45,7 +50,7 @@

@Override
public void cancel() {
Subscription old = subscription.getAndSet(CANCELLED);
Subscription old = SUBSCRIPTION_UPDATER.getAndSet(this, CANCELLED);
if (old != null) {
old.cancel();
}
Expand All @@ -54,17 +59,17 @@
// ---- Subscriber

@Override
public void onSubscribe(Subscription s) {
if (subscription.compareAndSet(null, s)) {
s.request(1L);
public void onSubscribe(Subscription sub) {
if (SUBSCRIPTION_UPDATER.compareAndSet(this, null, sub)) {
sub.request(1L);
} else {
s.cancel();
sub.cancel();

Check warning on line 66 in implementation/src/main/java/io/smallrye/mutiny/operators/uni/builders/UniCreateFromPublisher.java

View check run for this annotation

Codecov / codecov/patch

implementation/src/main/java/io/smallrye/mutiny/operators/uni/builders/UniCreateFromPublisher.java#L66

Added line #L66 was not covered by tests
}
}

@Override
public void onNext(T item) {
Subscription sub = subscription.getAndSet(CANCELLED);
Subscription sub = SUBSCRIPTION_UPDATER.getAndSet(this, CANCELLED);
if (sub != CANCELLED) {
sub.cancel();
subscriber.onItem(item);
Expand All @@ -73,15 +78,15 @@

@Override
public void onError(Throwable failure) {
Subscription sub = subscription.getAndSet(CANCELLED);
Subscription sub = SUBSCRIPTION_UPDATER.getAndSet(this, CANCELLED);
if (sub != CANCELLED) {
subscriber.onFailure(failure);
}
}

@Override
public void onComplete() {
Subscription sub = subscription.getAndSet(CANCELLED);
Subscription sub = SUBSCRIPTION_UPDATER.getAndSet(this, CANCELLED);
if (sub != CANCELLED) {
subscriber.onItem(null);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ default void request(long n) {
if (n < 1) {
throw new IllegalArgumentException("Invalid request");
}
// Ignored, on Uni the request happen at subscription time.
// Ignored, on Uni the request happens at subscription time.
}
}