Sitelet https://github.com/ReactiveX/RxJavaString/pull/36/commits/f7e8244a894ab7d5a6e45090ab078a56a96e017b
Skip to content

update rx dependency to 1.1.1 #36

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
zsxwing merged 2 commits into from
Mar 16, 2016
Merged

update rx dependency to 1.1.1 #36

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5da471
update rx dependency to 1.1.1
jadlr Mar 1, 2016
f7e8244
always use state param instead of field
jadlr Mar 2, 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
Prev Previous commit
always use state param instead of field
  • Loading branch information
@jadlr
jadlr committed Mar 2, 2016
commit f7e8244a894ab7d5a6e45090ab078a56a96e017b
2 changes: 1 addition & 1 deletion src/main/java/rx/internal/operators/OnSubscribeInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ protected InputStream generateState() {
protected InputStream next(InputStream state, Observer<? super byte[]> observer) {
byte[] buffer = new byte[size];
try {
int count = this.is.read(buffer);
int count = state.read(buffer);
if (count == -1)
observer.onCompleted();
else if (count < size)
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/rx/internal/operators/OnSubscribeReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ protected Reader generateState() {
protected Reader next(Reader state, Observer<? super String> observer) {
char[] buffer = new char[size];
try {
int count = reader.read(buffer);
int count = state.read(buffer);
if (count == -1)
observer.onCompleted();
else
observer.onNext(String.valueOf(buffer, 0, count));
} catch (IOException e) {
observer.onError(e);
}
return reader;
return state;
}
}