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

Servlet tests and fb fix
whoschek · May 7, 2012 · 45b0fe4 · 45b0fe4
2 parents 4c9f9b6 + 8186c8c
commit 45b0fe4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/metrics-servlet/src/main/java/com/yammer/metrics/reporting/AdminServlet.java b/metrics-servlet/src/main/java/com/yammer/metrics/reporting/AdminServlet.java
@@ -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);

diff --git a/metrics-servlet/src/test/java/com/yammer/metrics/reporting/tests/AdminServletTest.java b/metrics-servlet/src/test/java/com/yammer/metrics/reporting/tests/AdminServletTest.java
@@ -42,7 +42,7 @@ public class AdminServletTest {
 
     @Before
     public void setUp() throws Exception {
-        when(context.getContextPath()).thenReturn("/context");
+        when(request.getContextPath()).thenReturn("/context");
 
         when(config.getServletContext()).thenReturn(context);