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

HystrixObservableCollapser #245

Merged
merged 1 commit into from
Apr 23, 2014
Merged

HystrixObservableCollapser #245

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hystrix-core/src/main/java/com/netflix/hystrix/HystrixCollapser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public abstract class HystrixCollapser<BatchReturnType, ResponseType, RequestArg
* <li>GLOBAL: Requests from any thread (ie. all HTTP requests) within the JVM will be collapsed. 1 queue for entire app.</li>
* </ul>
*/
public static enum Scope {
public static enum Scope implements RequestCollapserFactory.Scope {
REQUEST, GLOBAL
}

Expand Down Expand Up @@ -185,7 +185,7 @@ public HystrixCollapserKey getCollapserKey() {
* @return {@link Scope} that collapsing should be performed within.
*/
public Scope getScope() {
return collapserFactory.getScope();
return Scope.valueOf(collapserFactory.getScope().name());
}

/**
Expand Down
Loading