Merge pull request Netflix#307 from nurkiewicz/patch-1

Avoid NPE when 'origin' parameter not present
bankwing · Sep 4, 2014 · efb889b · efb889b
2 parents fa6b255 + c00e9ce
commit efb889b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/hystrix-dashboard/src/main/java/com/netflix/hystrix/dashboard/stream/ProxyStreamServlet.java b/hystrix-dashboard/src/main/java/com/netflix/hystrix/dashboard/stream/ProxyStreamServlet.java
@@ -42,6 +42,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
         if (origin == null) {
             response.setStatus(500);
             response.getWriter().println("Required parameter 'origin' missing. Example: 107.20.175.135:7001");
+            return;
         }
         origin = origin.trim();