From 5a047c967e61ee08dd13761027ad9f4b44388ae9 Mon Sep 17 00:00:00 2001
From: Eric Zimanyi <ezimanyi@google.com>
Date: Mon, 10 Jun 2019 18:07:23 -0400
Subject: [PATCH] fix(spel): Fix NPE in SpEL evaluation

Evaluating SpEL on a null object throws an NPE; if the input object
is null, just return null as the evaluated expression.
---
 .../orca/pipeline/util/ContextParameterProcessor.java         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessor.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessor.java
index 9ca929f545..d5089a6822 100644
--- a/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessor.java
+++ b/orca-core/src/main/java/com/netflix/spinnaker/orca/pipeline/util/ContextParameterProcessor.java
@@ -74,6 +74,10 @@ public Map<String, Object> process(
       boolean allowUnknownKeys,
       ExpressionEvaluationSummary summary) {
 
+    if (source == null) {
+      return null;
+    }
+
     if (source.isEmpty()) {
       return new HashMap<>();
     }