Merge pull request #826 from mattrjacobs/safely-handle-negative-delay

mattrjacobs · mattrjacobs · commit 14a461140246 · 2015-06-21T11:51:58.000-07:00
Safely handle negative input on the delay input to metrics-stream
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ private void handleRequest(HttpServletRequest request, HttpServletResponse respo`
`124`	`124`	`try {`
`125`	`125`	`String d = request.getParameter("delay");`
`126`	`126`	`if (d != null) {`
`127`		`- delay = Integer.parseInt(d);`
	`127`	`+ delay = Math.max(Integer.parseInt(d), 1);`
`128`	`128`	`}`
`129`	`129`	`} catch (Exception e) {`
`130`	`130`	`// ignore if it's not a number`