[nifi] branch master updated: NIFI-6692: Fixing NullPointerException when not using Kerberos

[pvillard]

This is an automated email from the ASF dual-hosted git repository.

pvillard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 17a16ba  NIFI-6692: Fixing NullPointerException when not using Kerberos
17a16ba is described below

commit 17a16ba68b4d306f391a303cc39a393ea441df0e
Author: samhjelmfelt <samhjelmf...@yahoo.com>
AuthorDate: Thu Sep 19 16:08:54 2019 -0500

    NIFI-6692: Fixing NullPointerException when not using Kerberos
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #3755.
---
 .../nifi/processors/kudu/AbstractKuduProcessor.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java
 
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java
index c1b1a81..6f946f4 100644
--- 
a/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java
+++ 
b/nifi-nar-bundles/nifi-kudu-bundle/nifi-kudu-processors/src/main/java/org/apache/nifi/processors/kudu/AbstractKuduProcessor.java
@@ -107,16 +107,16 @@ public abstract class AbstractKuduProcessor extends 
AbstractProcessor {
         final String kuduMasters = 
context.getProperty(KUDU_MASTERS).evaluateAttributeExpressions().getValue();
         final KerberosCredentialsService credentialsService = 
context.getProperty(KERBEROS_CREDENTIALS_SERVICE).asControllerService(KerberosCredentialsService.class);
 
-        if (credentialsService == null) {
-            return;
-        }
-
-        final String keytab = credentialsService.getKeytab();
-        final String principal = credentialsService.getPrincipal();
-        kerberosUser = loginKerberosUser(principal, keytab);
+        if (credentialsService != null) {
+            final String keytab = credentialsService.getKeytab();
+            final String principal = credentialsService.getPrincipal();
+            kerberosUser = loginKerberosUser(principal, keytab);
 
-        final KerberosAction<KuduClient> kerberosAction = new 
KerberosAction<>(kerberosUser, () -> buildClient(kuduMasters, context), 
getLogger());
-        this.kuduClient = kerberosAction.execute();
+            final KerberosAction<KuduClient> kerberosAction = new 
KerberosAction<>(kerberosUser, () -> buildClient(kuduMasters, context), 
getLogger());
+            this.kuduClient = kerberosAction.execute();
+        } else {
+            this.kuduClient = buildClient(kuduMasters, context);
+        }
     }