Skip to content

Commit 442d5c3

Browse files
committed
Upgrade to RC1 of RS.
Closes #13.
1 parent bcd1e46 commit 442d5c3

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

rxjava-reactive-streams/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ apply plugin: 'java'
44

55
dependencies {
66
compile 'io.reactivex:rxjava:1.0.+'
7-
compile 'org.reactivestreams:reactive-streams:1.0.0.M1'
8-
testCompile 'org.reactivestreams:reactive-streams-tck:1.0.0.M1'
7+
compile 'org.reactivestreams:reactive-streams:1.0.0.RC1'
8+
testCompile 'org.reactivestreams:reactive-streams-tck:1.0.0.RC1'
99
}
1010

1111
test {

rxjava-reactive-streams/src/main/java/rx/internal/reactivestreams/PublisherAdapter.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ public void onStart() {
6060
@Override
6161
public void request(long n) {
6262
if (n < 1) {
63-
throw new IllegalArgumentException("3.9 While the Subscription is not cancelled, Subscription.request(long n) MUST throw a java.lang.IllegalArgumentException if the argument is <= 0.");
63+
unsubscribe();
64+
onError(new IllegalArgumentException("3.9 While the Subscription is not cancelled, Subscription.request(long n) MUST throw a java.lang.IllegalArgumentException if the argument is <= 0."));
6465
}
6566

6667
requested.set(true);

rxjava-reactive-streams/src/test/java/rx/reactivestreams/TckSubscriberBlackboxTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class TckSubscriberBlackboxTest extends SubscriberBlackboxVerification<Lo
3131

3232
public static final long DEFAULT_TIMEOUT_MILLIS = 300L;
3333

34-
protected TckSubscriberBlackboxTest() {
34+
public TckSubscriberBlackboxTest() {
3535
super(new TestEnvironment(DEFAULT_TIMEOUT_MILLIS));
3636
}
3737

rxjava-reactive-streams/src/test/java/rx/reactivestreams/TckSubscriberWhiteboxTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class TckSubscriberWhiteboxTest extends SubscriberWhiteboxVerification<Lo
3434

3535
public static final long DEFAULT_TIMEOUT_MILLIS = 300L;
3636

37-
protected TckSubscriberWhiteboxTest() {
37+
public TckSubscriberWhiteboxTest() {
3838
super(new TestEnvironment(DEFAULT_TIMEOUT_MILLIS));
3939
}
4040

0 commit comments

Comments
 (0)