commit eddab3b12a1318f6e787d062816e28479715f077
author Sharmadha Sainath <ssainath@hortonworks.com> Sat Jul 15 01:16:31 2017 +0530
committer Madhan Neethiraj <madhan@apache.org> Sat Jul 15 14:22:41 2017 -0700
tree a6e50fafb34fbc774722a70f91385b37c1f5ac9b
parent 84c6d52d266c6aa2039e7e8cb9a7edb8f4bb8a93

ATLAS-1939: added parameter validation to prevent NPE during import

Signed-off-by: Madhan Neethiraj <madhan@apache.org>

webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java

diff --git a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
index 2a5fc90..fe9111b 100755
--- a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
+++ b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
@@ -370,6 +370,10 @@
         AtlasImportResult result;
 
         try {
+            if (StringUtils.isEmpty(jsonData)) {
+                jsonData = "{}";
+            }
+
             AtlasImportRequest request = AtlasType.fromJson(jsonData, AtlasImportRequest.class);
             ZipSource zipSource = new ZipSource(inputStream);