Merge pull request #249 from go-martini/JMS-Revert-246

Reverting changes from #246
go-martini · Apr 25, 2014 · de64386 · de64386 · sevkin · Apr 25, 2014
2 parents c7203d5 + 5f090c9
commit de64386
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/router.go b/router.go
@@ -110,11 +110,7 @@ func (r *router) Handle(res http.ResponseWriter, req *http.Request, context Cont
 			params := Params(vals)
 			context.Map(params)
 			route.Handle(context, res)
-			if context.Written() {
-				return
-			} else {
-				break
-			}
+			return
 		}
 	}
 

diff --git a/router_test.go b/router_test.go
@@ -125,6 +125,8 @@ func Test_Routing(t *testing.T) {
 	router.Handle(recorder, req12, context12)
 	router.Handle(recorder, req13, context13)
 	expect(t, result, "foobarbatbarfoofezpopbapwappowwappowoptsfoobazzingagetbazzingapostbazzingagroupception")
+	expect(t, recorder.Code, http.StatusNotFound)
+	expect(t, recorder.Body.String(), "404 page not found\n")
 }
 
 func Test_RouterHandlerStatusCode(t *testing.T) {