Allow passing nil to ThenFunc

dolmen-go · Jul 20, 2014 · 35b4790 · 35b4790
1 parent 4623c37
commit 35b4790
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/chain.go b/chain.go
@@ -69,6 +69,9 @@ func (c Chain) Then(h http.Handler) http.Handler {
 //
 // ThenFunc provides all the guarantees of Then.
 func (c Chain) ThenFunc(fn http.HandlerFunc) http.Handler {
+	if fn == nil {
+		return c.Then(nil)
+	}
 	return c.Then(http.HandlerFunc(fn))
 }
 

diff --git a/chain_test.go b/chain_test.go
@@ -55,6 +55,11 @@ func TestThenTreatsNilAsDefaultServeMux(t *testing.T) {
 	assert.Equal(t, chained, http.DefaultServeMux)
 }
 
+func TestThenFuncTreatsNilAsDefaultServeMux(t *testing.T) {
+	chained := New().ThenFunc(nil)
+	assert.Equal(t, chained, http.DefaultServeMux)
+}
+
 func TestThenOrdersHandlersRight(t *testing.T) {
 	t1 := tagMiddleware("t1\n")
 	t2 := tagMiddleware("t2\n")