From b500e184e8fdc7f2a63668048b7770cc9377641c Mon Sep 17 00:00:00 2001 From: Ben Christensen <benjchristensen@netflix.com> Date: Mon, 5 May 2014 20:40:37 -0700 Subject: [PATCH] Compilation fixes ... missed these when doing https://github.com/Netflix/Hystrix/commit/00d8ecb9c87c35e91a2b1a696ea92c8ffb8121ad#diff-bcc766d81acc427070683ec44e8320c2 --- hystrix-contrib/hystrix-javanica/build.gradle | 1 + .../metrics/eventstream/HystrixMetricsStreamServlet.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hystrix-contrib/hystrix-javanica/build.gradle b/hystrix-contrib/hystrix-javanica/build.gradle index 26086ae9a..7fa6d5de7 100644 --- 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/hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java b/hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java index 1b3616692..faf07e604 100644 --- a/hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java +++ b/hystrix-contrib/hystrix-metrics-event-stream/src/main/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 { /**