Repository: atlas Updated Branches: refs/heads/master 14df38de4 -> 247ad8b26
ATLAS-2321: fix V1 DSL API handling of empty results Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/247ad8b2 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/247ad8b2 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/247ad8b2 Branch: refs/heads/master Commit: 247ad8b2620b92d7ca9c99d3f82082e3f60f17d5 Parents: 14df38d Author: Madhan Neethiraj <mad...@apache.org> Authored: Thu Dec 21 17:18:09 2017 -0800 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Thu Dec 21 17:18:09 2017 -0800 ---------------------------------------------------------------------- .../org/apache/atlas/web/resources/MetadataDiscoveryResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/247ad8b2/webapp/src/main/java/org/apache/atlas/web/resources/MetadataDiscoveryResource.java ---------------------------------------------------------------------- diff --git a/webapp/src/main/java/org/apache/atlas/web/resources/MetadataDiscoveryResource.java b/webapp/src/main/java/org/apache/atlas/web/resources/MetadataDiscoveryResource.java index 6b7f920..d8f3df3 100755 --- a/webapp/src/main/java/org/apache/atlas/web/resources/MetadataDiscoveryResource.java +++ b/webapp/src/main/java/org/apache/atlas/web/resources/MetadataDiscoveryResource.java @@ -33,6 +33,7 @@ import org.apache.atlas.utils.AtlasPerfTracer; import org.apache.atlas.utils.ParamChecker; import org.apache.atlas.web.util.Servlets; import org.apache.commons.configuration.Configuration; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -305,7 +306,7 @@ public class MetadataDiscoveryResource { } public DSLJSONResponseBuilder results(String dslResults) throws IOException { - return results(AtlasJson.parseToV1ArrayNode(dslResults)); + return results(StringUtils.isEmpty(dslResults) ? AtlasJson.createV1ArrayNode() : AtlasJson.parseToV1ArrayNode(dslResults)); } @Override
