policy: Always returns a valid L4 policy construct on lookup

Fixes panic on endpoint unregister Signed-off-by: Thomas Graf <thomas@cilium.io>
cilium · Mar 18, 2017 · 592376e · 592376e
1 parent dd317dc
commit 592376e
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/pkg/policy/tree.go b/pkg/policy/tree.go
@@ -124,13 +124,11 @@ func (t *Tree) ResolveL4Policy(ctx *SearchContext) *L4Policy {
 
 	policyTrace(ctx, "Resolving L4 policy for context %+v\n", ctx)
 
-	if t.Root == nil {
-		return nil
+	if t.Root != nil {
+		t.Root.ResolveL4Policy(ctx, result)
 	}
 
-	t.Root.ResolveL4Policy(ctx, result)
 	policyTrace(ctx, "Final tree L4 policy: %+v\n", result)
-
 	return result
 }