From cdde2a6b3a8cd09a7491f600c1a33bc4156296d6 Mon Sep 17 00:00:00 2001
From: jiangbo <jiangbo@dtstack.com>
Date: Wed, 8 Apr 2020 22:09:38 +0800
Subject: [PATCH] fix npe and load local keytab file

---
 .../java/com/dtstack/flinkx/authenticate/KerberosUtil.java   | 5 +++++
 .../com/dtstack/flinkx/inputformat/BaseRichInputFormat.java  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/authenticate/KerberosUtil.java b/flinkx-core/src/main/java/com/dtstack/flinkx/authenticate/KerberosUtil.java
index 15a0cbcc83..c89f0b2274 100644
--- a/flinkx-core/src/main/java/com/dtstack/flinkx/authenticate/KerberosUtil.java
+++ b/flinkx-core/src/main/java/com/dtstack/flinkx/authenticate/KerberosUtil.java
@@ -226,6 +226,11 @@ public static String getPrincipalFileName(Map<String, Object> config) {
             throw new RuntimeException("[principalFile]必须指定");
         }
 
+        boolean useLocalFile = MapUtils.getBooleanValue(config, KEY_USE_LOCAL_FILE);
+        if (useLocalFile) {
+            return fileName;
+        }
+
         if (fileName.contains(SP)) {
             fileName = fileName.substring(fileName.lastIndexOf(SP) + 1);
         }
diff --git a/flinkx-core/src/main/java/com/dtstack/flinkx/inputformat/BaseRichInputFormat.java b/flinkx-core/src/main/java/com/dtstack/flinkx/inputformat/BaseRichInputFormat.java
index 2b913843fb..64bb73f2c3 100644
--- a/flinkx-core/src/main/java/com/dtstack/flinkx/inputformat/BaseRichInputFormat.java
+++ b/flinkx-core/src/main/java/com/dtstack/flinkx/inputformat/BaseRichInputFormat.java
@@ -71,7 +71,7 @@ public abstract class BaseRichInputFormat extends org.apache.flink.api.common.io
 
     protected FormatState formatState;
 
-    protected TestConfig testConfig;
+    protected TestConfig testConfig = TestConfig.defaultConfig();
 
     protected transient BaseMetric inputMetric;