Skip to content
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.

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

Added retry and retryWhen support for Single #3686

Merged
merged 1 commit into from
Feb 10, 2016
Merged

Conversation

klemzy
Copy link

@klemzy klemzy commented Feb 9, 2016

No description provided.

@@ -1,45 +1,18 @@
/**
* Copyright 2015 Netflix, Inc.
*
* <p/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happened to the header?

@akarnokd
Copy link
Member

akarnokd commented Feb 9, 2016

Please don't unroll import * because it creates merge conflicts all the time.

@klemzy
Copy link
Author

klemzy commented Feb 9, 2016

My codestyle settings messed everything a bit. Is there a exported codestyle.xml file or something similar so I could import into my IDE?

@akarnokd
Copy link
Member

akarnokd commented Feb 9, 2016

Not really. Also please squash your commits.

*
* <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
*
* If the source Single calls {@link Observer#onError}, this method will resubscribe to the source
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SingleSubscriber#onError

@akarnokd
Copy link
Member

akarnokd commented Feb 9, 2016

Could you also fix those 1 spaces removed everywhere?

@klemzy
Copy link
Author

klemzy commented Feb 10, 2016

I have fixed all reported problems.

@@ -1,50 +1,37 @@
/**
* Copyright 2015 Netflix, Inc.
*
*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These space removals are still there. Are you using IntelliJ? I'm sure there is a way to disable the remove whitespace from line ends option.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I am using Intellij. Ok I will check.

@klemzy
Copy link
Author

klemzy commented Feb 10, 2016

Something went really wrong. I merged latest changes from upstream 1.x to my 1.x branch.

@akarnokd
Copy link
Member

In this case, I'd just start from a clean branch of master and reapply/merge my customizations.

@klemzy
Copy link
Author

klemzy commented Feb 10, 2016

I managed to fix it. Now I just need to sort out the missing spaces.

@akarnokd
Copy link
Member

This looks much better.

👍

@stevegury
Copy link
Member

👍

akarnokd added a commit that referenced this pull request Feb 10, 2016
Added retry and retryWhen support for Single
@akarnokd akarnokd merged commit 63434c6 into ReactiveX:1.x Feb 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants