From b8c64e30d18d3ea41de703d369e2a97063bce08f Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <liggitt@google.com>
Date: Sat, 12 Jan 2019 11:11:47 -0500
Subject: [PATCH] Fix nil panic propagation

---
 staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
index f0d2216a30..5d7abf229c 100644
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
@@ -190,9 +190,9 @@ func finishRequest(timeout time.Duration, fn resultFunc) (result runtime.Object,
 				buf := make([]byte, size)
 				buf = buf[:goruntime.Stack(buf, false)]
 				panicReason = strings.TrimSuffix(fmt.Sprintf("%v\n%s", panicReason, string(buf)), "\n")
+				// Propagate to parent goroutine
+				panicCh <- panicReason
 			}
-			// Propagate to parent goroutine
-			panicCh <- panicReason
 		}()
 
 		if result, err := fn(); err != nil {