commit e90e244396ecffeb332633c89e641357adcf8eda
author Tak Lon (Stephen) Wu <terronwu@gmail.com> Wed Apr 03 01:38:33 2019 -0700
committer Szabolcs Vasas <vasas@apache.org> Wed Apr 03 10:38:33 2019 +0200
tree 60ddb7441f19ecd5a482465fb55b6e6cf9eac271
parent 0216f7fbb7b71f610d02dfa95dafb2c81acbc690

SQOOP-3435: Avoid NullPointerException due to different JSONObject library in classpath

src/java/org/apache/sqoop/util/SqoopJsonUtil.java

diff --git a/src/java/org/apache/sqoop/util/SqoopJsonUtil.java b/src/java/org/apache/sqoop/util/SqoopJsonUtil.java
index adf186b..9e8ba95 100644
--- a/src/java/org/apache/sqoop/util/SqoopJsonUtil.java
+++ b/src/java/org/apache/sqoop/util/SqoopJsonUtil.java
@@ -40,7 +40,8 @@
   }
 
   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();
   }