handel nil context value in field.FromContext() func (#298)

kanisterio · Sep 19, 2019 · bd447e0 · bd447e0
1 parent 4decc20
commit bd447e0
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/field/context.go b/pkg/field/context.go
@@ -10,8 +10,10 @@ const ctxKey = contextKey(43)
 
 // FromContext returns the fields present in ctx if any
 func FromContext(ctx context.Context) Fields {
-	if s, ok := ctx.Value(ctxKey).(Fields); ok {
-		return s
+	if ctx != nil {
+		if s, ok := ctx.Value(ctxKey).(Fields); ok {
+			return s
+		}
 	}
 	return nil
 }