Skip to content
Browse files

Merge pull request #241 from cb372/servlet-tests-and-fb-fix

Servlet tests and fb fix
  • Loading branch information...
2 parents 4c9f9b6 + 8186c8c commit 45b0fe4b628a5b435724fbe11c84c3bf3e9d4f3e @codahale codahale committed May 7, 2012
View
2 metrics-servlet/src/main/java/com/yammer/metrics/reporting/AdminServlet.java 100644 → 100755
@@ -80,7 +80,7 @@ public void init(ServletConfig config) throws ServletException {
pingServlet.init(config);
threadDumpServlet.init(config);
- final ServletContext context = config.getServletContext();
+ //final ServletContext context = config.getServletContext();
this.metricsUri = getParam(config.getInitParameter("metrics-uri"), this.metricsUri);
this.pingUri = getParam(config.getInitParameter("ping-uri"), this.pingUri);
this.threadsUri = getParam(config.getInitParameter("threads-uri"), this.threadsUri);
View
2 metrics-servlet/src/test/java/com/yammer/metrics/reporting/tests/AdminServletTest.java 100644 → 100755
@@ -42,7 +42,7 @@
@Before
public void setUp() throws Exception {
- when(context.getContextPath()).thenReturn("/context");
+ when(request.getContextPath()).thenReturn("/context");
when(config.getServletContext()).thenReturn(context);

0 comments on commit 45b0fe4

Please sign in to comment.
Something went wrong with that request. Please try again.