Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Compilation fixes #262

Merged
merged 1 commit into from

2 participants

@benjchristensen benjchristensen merged commit 7cf36e6 into Netflix:master
@benjchristensen benjchristensen deleted the benjchristensen:compilation-fix branch
@cloudbees-pull-request-builder

Hystrix-pull-requests #130 SUCCESS
This pull request looks good

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 6, 2014
  1. @benjchristensen
This page is out of date. Refresh to see the latest.
View
1  hystrix-contrib/hystrix-javanica/build.gradle
@@ -13,6 +13,7 @@ dependencies {
compile 'com.google.guava:guava:15.0'
compile 'commons-collections:commons-collections:3.2.1'
compile 'org.apache.commons:commons-lang3:3.1'
+ compile 'com.google.code.findbugs:jsr305:2.0.0'
testCompile 'junit:junit-dep:4.10'
testCompile 'org.springframework:spring-core:4.0.0.RELEASE'
testCompile 'org.springframework:spring-context:4.0.0.RELEASE'
View
3  ...ain/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java
@@ -21,7 +21,6 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.annotation.concurrent.ThreadSafe;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -176,8 +175,8 @@ private void handleRequest(HttpServletRequest request, HttpServletResponse respo
/**
* This will be called from another thread so needs to be thread-safe.
+ * @ThreadSafe
*/
- @ThreadSafe
private static class MetricJsonListener implements HystrixMetricsPoller.MetricsAsJsonPollerListener {
/**
Something went wrong with that request. Please try again.