ATLAS-1997: fix to avoid NPE while getting vertex_indices

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

ATLAS-1997: fix to avoid NPE while getting vertex_indices
38297a84 · apoorvnaik · Madhan Neethiraj · eb5d6fcd · 38297a84
Commit 38297a84 authored Jul 27, 2017 by apoorvnaik Committed by Madhan Neethiraj Aug 02, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

GraphBackedSearchIndexer.java ...ache/atlas/repository/graph/GraphBackedSearchIndexer.java +4 -2

No files found.
--- a/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java
+++ b/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java
@@ -263,10 +263,11 @@ public class GraphBackedSearchIndexer implements SearchIndexer, ActiveStateChang
            }

            if (management != null) {
-                recomputeIndexedKeys = false;
-
                AtlasGraphIndex vertexIndex = management.getGraphIndex(Constants.VERTEX_INDEX);

+                if (vertexIndex != null) {
+                    recomputeIndexedKeys = false;
+
                    Set<String> indexKeys = new HashSet<>();

                    for (AtlasPropertyKey fieldKey : vertexIndex.getFieldKeys()) {
@@ -276,6 +277,7 @@ public class GraphBackedSearchIndexer implements SearchIndexer, ActiveStateChang
                    vertexIndexKeys = indexKeys;
                }
            }
+        }

        return vertexIndexKeys;
    }