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.

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

Jump to bottom

Make HystrixCommandProperties backwards-compatible for classes which extend it #694

Merged
merged 1 commit into from
Feb 23, 2015
Merged

Make HystrixCommandProperties backwards-compatible for classes which extend it #694

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion hystrix-core/src/main/java/com/netflix/hystrix/HystrixCommandProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,12 @@ public HystrixProperty<Integer> executionIsolationThreadTimeoutInMilliseconds()
* @return {@code HystrixProperty<Integer>}
*/
public HystrixProperty<Integer> executionTimeoutInMilliseconds() {
return executionTimeoutInMilliseconds;
/**
* Calling a deprecated method here is a temporary workaround. We do this because {@link #executionTimeoutInMilliseconds()} is a new method (as of 1.4.0-rc.7) and an extending
* class will not have this method. It will have {@link #executionIsolationThreadTimeoutInMilliseconds()}, however.
* So, to stay compatible with an extension, we perform this redirect.
*/
return executionIsolationThreadTimeoutInMilliseconds();
}

/**
Expand Down