From e90e244396ecffeb332633c89e641357adcf8eda Mon Sep 17 00:00:00 2001
From: "Tak Lon (Stephen) Wu" <terronwu@gmail.com>
Date: Wed, 3 Apr 2019 01:38:33 -0700
Subject: [PATCH] SQOOP-3435: Avoid NullPointerException due to different
 JSONObject library in classpath

---
 src/java/org/apache/sqoop/util/SqoopJsonUtil.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/sqoop/util/SqoopJsonUtil.java b/src/java/org/apache/sqoop/util/SqoopJsonUtil.java
index adf186b7..9e8ba95c 100644
--- a/src/java/org/apache/sqoop/util/SqoopJsonUtil.java
+++ b/src/java/org/apache/sqoop/util/SqoopJsonUtil.java
@@ -40,7 +40,8 @@ private SqoopJsonUtil() {
   }
 
   public static String getJsonStringforMap(Map<String, String> map) {
-    JSONObject pathPartMap = new JSONObject(map);
+    Map<String, String> mapToUse = (map == null) ? Collections.emptyMap() : map;
+    JSONObject pathPartMap = new JSONObject(mapToUse);
     return pathPartMap.toString();
   }