Fix issue #1069 and add according Test

src/main/java/spark/ExceptionMapper.java

@@ -18,6 +18,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 public class ExceptionMapper {
 
@@ -52,7 +53,7 @@ public synchronized static ExceptionMapper getServletInstance() {
      * Class constructor
      */
     public ExceptionMapper() {
-        this.exceptionMap = new HashMap<>();
+        this.exceptionMap = new ConcurrentHashMap<>();
     }
 
     /**
@@ -94,7 +95,8 @@ public ExceptionHandlerImpl getHandler(Class<? extends Exception> exceptionClass
 
             // No handler found either for the superclasses of the exception class
             // We cache the null value to prevent future
-            this.exceptionMap.put(exceptionClass, null);
+            // We do not need to cache the null value. comment by lloyd.
+            // this.exceptionMap.put(exceptionClass, null);
             return null;
         }
 

src/main/java/spark/embeddedserver/jetty/JettyHandler.java

@@ -33,7 +33,7 @@
  */
 public class JettyHandler extends SessionHandler {
 
-    private Filter filter;
+    private final Filter filter;
 
     public JettyHandler(Filter filter) {
         this.filter = filter;
@@ -45,16 +45,11 @@ public void doHandle(
             Request baseRequest,
             HttpServletRequest request,
             HttpServletResponse response) throws IOException, ServletException {
-
         HttpRequestWrapper wrapper = new HttpRequestWrapper(request);
         filter.doFilter(wrapper, response, null);
 
-        if (wrapper.notConsumed()) {
-            baseRequest.setHandled(false);
-        } else {
-            baseRequest.setHandled(true);
-        }
+        baseRequest.setHandled(!wrapper.notConsumed());
 
     }
 
-}
+}

src/main/java/spark/http/matching/MatcherFilter.java

@@ -105,6 +105,8 @@ public void doFilter(ServletRequest servletRequest,
 
         String httpMethodStr = method.toLowerCase();
         String uri = httpRequest.getRequestURI();
+        if (uri.length() > 1 && uri.endsWith("/"))
+            uri = uri.substring(0, uri.length() - 1);
         String acceptType = httpRequest.getHeader(ACCEPT_TYPE_REQUEST_MIME_HEADER);
 
         Body body = Body.create();
@@ -133,7 +135,6 @@ public void doFilter(ServletRequest servletRequest,
                 BeforeFilters.execute(context);
                 Routes.execute(context);
                 AfterFilters.execute(context);
-
             } catch (HaltException halt) {
 
                 Halt.modify(httpResponse, body, halt);

src/test/java/spark/embeddedserver/jetty/JettyHandlerTest.java

@@ -0,0 +1,4 @@
+package spark.embeddedserver.jetty;
+
+public class JettyHandlerTest {
+}