Merge pull request Netflix#826 from mattrjacobs/safely-handle-negativ…

…e-delay Safely handle negative input on the delay input to metrics-stream
galagaevdc · Jun 21, 2015 · 14a4611 · 14a4611
2 parents 61152a0 + a2b2dc6
commit 14a4611
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...ain/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java b/...ain/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsStreamServlet.java
@@ -124,7 +124,7 @@ private void handleRequest(HttpServletRequest request, HttpServletResponse respo
                 try {
                     String d = request.getParameter("delay");
                     if (d != null) {
-                        delay = Integer.parseInt(d);
+                        delay = Math.max(Integer.parseInt(d), 1);
                     }
                 } catch (Exception e) {
                     // ignore if it's not a number