Merge pull request Netflix#262 from benjchristensen/compilation-fix

Compilation fixes
lenko-d · May 6, 2014 · 7cf36e6 · 7cf36e6
2 parents 7ff4cca + b500e18
commit 7cf36e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hystrix-contrib/hystrix-javanica/build.gradle b/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'

diff --git a/...ain/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java b/...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 {
 
         /**