ATLAS-1258 BugFix for Indexer NPE on StructDef lookup (apoorvnaik via sumasai)

release-log.txt

@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
+ATLAS-1258 BugFix for Indexer NPE on StructDef lookup (apoorvnaik via sumasai)
 ATLAS-1233 UnitTests for the TypeDefStores (apoorvnaik via sumasai)
 ATLAS-1240 Adding Change listeners to react on changes in TypesDef (apoorvnaik via sumasai)
 ATLAS-1239 when stopping Atlas on the command line it should explicitly say when it has stopped (ayubkhan via sumasai)

repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java

@@ -280,17 +280,11 @@ public class GraphBackedSearchIndexer implements SearchIndexer, ActiveStateChang
 
             if (isMapType || isArrayType || isClassificationType(atlasType) || isEntityType(atlasType)) {
                 LOG.warn("Ignoring non-indexable attribute {}", attribTypeName);
-            }
-
-            if (isBuiltInType) {
+            } else if (isBuiltInType) {
                 createIndexes(management, propertyName, getPrimitiveClass(attribTypeName), isUnique, cardinality, false, isIndexable);
-            }
-
-            if (isEnumType(atlasType)) {
+            } else if (isEnumType(atlasType)) {
                 createIndexes(management, propertyName, String.class, isUnique, cardinality, false, isIndexable);
-            }
-
-            if (isStructType(atlasType)) {
+            } else if (isStructType(atlasType)) {
                 AtlasStructDef structDef = typeRegistry.getStructDefByName(attributeDef.getName());
                 updateIndexForTypeDef(management, structDef);
             }