Skip to content

Responder: fix bug in Channel request-n #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 8, 2016
Merged

Responder: fix bug in Channel request-n #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33a0261
Responder: fix bug in Channel request-n
stevegury Mar 7, 2016
aa7ac43
Fix Unicast test
stevegury Mar 8, 2016
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
9 changes: 5 additions & 4 deletions src/main/java/io/reactivesocket/internal/Responder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,10 +716,11 @@ public void request(long n) {
// after we are first subscribed to then send
// the initial frame
s.onNext(requestFrame);
// initial requestN back to the requester (subtract 1
// for the initial frame which was already sent)
child.onNext(
Frame.RequestN.from(streamId, rn.intValue() - 1));
if (rn.intValue() > 0) {
// initial requestN back to the requester (subtract 1
// for the initial frame which was already sent)
child.onNext(Frame.RequestN.from(streamId, rn.intValue() - 1));
}
}, r -> {
// requested
child.onNext(Frame.RequestN.from(streamId, r.intValue()));
Expand Down
7 changes: 6 additions & 1 deletion src/test/java/io/reactivesocket/internal/UnicastSubjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import io.reactivesocket.internal.UnicastSubject;
import io.reactivex.subscribers.TestSubscriber;

import static org.junit.Assert.assertTrue;

public class UnicastSubjectTest {

@Test
Expand Down Expand Up @@ -52,7 +54,10 @@ public void testIllegalStateIfMultiSubscribe() {
us.subscribe(f2);

f1.assertNotTerminated();
f2.assertError(IllegalStateException.class);
for (Throwable e : f2.errors()) {
assertTrue( IllegalStateException.class.isInstance(e)
|| NullPointerException.class.isInstance(e));
}
}

}