commit 3a70d11d3c1a5d51e2c783ec28d9693b61bea71b
author Sarath Subramanian <ssubramanian@hortonworks.com> Thu Apr 27 17:00:58 2017 -0700
committer Sarath Subramanian <ssubramanian@hortonworks.com> Thu Apr 27 17:00:58 2017 -0700
tree 1548c70c5ea04018a4f2ccbf4fd5aed515aceec9
parent 4feee3bf61a032f742c0c4738e6ffdb423cdd14d

ATLAS-1611: Regression: Incorrect error code for the negative tests, returned: 500 server error, expected: 400 bad request

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

diff --git a/webapp/src/main/java/org/apache/atlas/web/resources/EntityResource.java b/webapp/src/main/java/org/apache/atlas/web/resources/EntityResource.java
index 8328da5..19c5594 100755
--- a/webapp/src/main/java/org/apache/atlas/web/resources/EntityResource.java
+++ b/webapp/src/main/java/org/apache/atlas/web/resources/EntityResource.java
@@ -1190,8 +1190,14 @@
         return jsonArray;
     }
 
-    private AtlasEntityType getEntityType(String typeName) {
-        return typeRegistry.getEntityTypeByName(typeName);
+    private AtlasEntityType getEntityType(String typeName) throws AtlasBaseException {
+        AtlasEntityType ret = typeRegistry.getEntityTypeByName(typeName);
+
+        if (ret == null) {
+            throw new AtlasBaseException(AtlasErrorCode.TYPE_NAME_NOT_FOUND, typeName);
+        }
+
+        return ret;
     }
 
     public static WebApplicationException toWebApplicationException(AtlasBaseException e) {