From 0c1365708c8696997f7d5b1da32faf623717aa44 Mon Sep 17 00:00:00 2001
From: Ian Buss <ibuss@cloudera.com>
Date: Thu, 15 Nov 2018 15:20:17 -0500
Subject: [PATCH] [ENV-360] Ensure returned token provider is valid (#236)

---
 .../main/java/com/cloudera/labs/envelope/run/Runner.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/cloudera/labs/envelope/run/Runner.java b/core/src/main/java/com/cloudera/labs/envelope/run/Runner.java
index 14d7b5e..6f4c22a 100644
--- a/core/src/main/java/com/cloudera/labs/envelope/run/Runner.java
+++ b/core/src/main/java/com/cloudera/labs/envelope/run/Runner.java
@@ -25,6 +25,7 @@
 import com.cloudera.labs.envelope.input.InputFactory;
 import com.cloudera.labs.envelope.input.StreamInput;
 import com.cloudera.labs.envelope.security.SecurityUtils;
+import com.cloudera.labs.envelope.security.TokenProvider;
 import com.cloudera.labs.envelope.security.TokenStoreManager;
 import com.cloudera.labs.envelope.security.UsesDelegationTokens;
 import com.cloudera.labs.envelope.spark.AccumulatorRequest;
@@ -488,7 +489,10 @@ private static void initializeSecurity(Config config, Set<Step> steps) throws Ex
 
     // Get all token providers
     for (InstantiatedComponent secureComponent : secureComponents) {
-      tokenStoreManager.addTokenProvider(((UsesDelegationTokens)secureComponent.getComponent()).getTokenProvider());
+      TokenProvider tokenProvider = ((UsesDelegationTokens)secureComponent.getComponent()).getTokenProvider();
+      if (tokenProvider != null) {
+        tokenStoreManager.addTokenProvider(tokenProvider);
+      }
     }
 
     LOG.debug("Starting TokenStoreManager thread");