ATLAS-3135: typedef-delete with empty typedefs result in search failures

intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java

@@ -393,9 +393,9 @@ public class AtlasTypeRegistry {
 
             if (typeDef != null) {
                 addTypeWithNoRefResolve(typeDef);
+            }
 
             resolveReferences();
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.addType({})", typeDef);
@@ -421,9 +421,9 @@ public class AtlasTypeRegistry {
 
             if (CollectionUtils.isNotEmpty(typeDefs)) {
                 addTypesWithNoRefResolve(typeDefs);
+            }
 
             resolveReferences();
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.addTypes(length={})", (typeDefs == null ? 0 : typeDefs.size()));
@@ -441,9 +441,9 @@ public class AtlasTypeRegistry {
                 addTypesWithNoRefResolve(typesDef.getClassificationDefs());
                 addTypesWithNoRefResolve(typesDef.getEntityDefs());
                 addTypesWithNoRefResolve(typesDef.getRelationshipDefs());
+            }
 
             resolveReferences();
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.addTypes({})", typesDef);
@@ -457,9 +457,9 @@ public class AtlasTypeRegistry {
 
             if (typeDef != null) {
                 updateTypeWithNoRefResolve(typeDef);
+            }
 
             resolveReferences();
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.updateType({})", typeDef);
@@ -473,9 +473,9 @@ public class AtlasTypeRegistry {
 
             if (guid != null && typeDef != null) {
                 updateTypeByGuidWithNoRefResolve(guid, typeDef);
+            }
 
             resolveReferences();
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.updateTypeByGuid({})", guid);
@@ -489,9 +489,9 @@ public class AtlasTypeRegistry {
 
             if (name != null && typeDef != null) {
                 updateTypeByNameWithNoRefResolve(name, typeDef);
+            }
 
             resolveReferences();
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.updateEnumDefByName({})", name);
@@ -505,9 +505,9 @@ public class AtlasTypeRegistry {
 
             if (CollectionUtils.isNotEmpty(typeDefs)) {
                 updateTypesWithNoRefResolve(typeDefs);
+            }
 
             resolveReferences();
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.updateTypes(length={})", (typeDefs == null ? 0 : typeDefs.size()));
@@ -521,9 +521,9 @@ public class AtlasTypeRegistry {
 
             if (typesDef != null) {
                 updateTypesWithNoRefResolve(typesDef);
+            }
 
             resolveReferences();
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.updateTypes({})", typesDef);
@@ -555,10 +555,10 @@ public class AtlasTypeRegistry {
                 removeTypesWithNoRefResolve(typesDef.getClassificationDefs());
                 removeTypesWithNoRefResolve(typesDef.getEntityDefs());
                 removeTypesWithNoRefResolve(typesDef.getRelationshipDefs());
+            }
 
             resolveReferences();
         }
-        }
 
         private void removeTypesWithNoRefResolve(Collection<? extends AtlasBaseTypeDef> typeDefs) {
             if (CollectionUtils.isNotEmpty(typeDefs)) {
@@ -619,17 +619,17 @@ public class AtlasTypeRegistry {
                 LOG.debug("==> AtlasTypeRegistry.removeTypeByGuid({})", guid);
             }
 
-            if (guid != null) {
             AtlasBaseTypeDef typeDef = getTypeDefByGuid(guid);
 
+            if (guid != null) {
                 registryData.removeByGuid(guid);
+            }
 
             resolveReferences();
 
             if (typeDef != null) {
                 deletedTypes.add(typeDef);
             }
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.removeTypeByGuid({})", guid);
@@ -641,17 +641,17 @@ public class AtlasTypeRegistry {
                 LOG.debug("==> AtlasTypeRegistry.removeTypeByName({})", name);
             }
 
-            if (name != null) {
             AtlasBaseTypeDef typeDef = getTypeDefByName(name);
 
+            if (name != null) {
                 registryData.removeByName(name);
+            }
 
             resolveReferences();
 
             if (typeDef != null) {
                 deletedTypes.add(typeDef);
             }
-            }
 
             if (LOG.isDebugEnabled()) {
                 LOG.debug("<== AtlasTypeRegistry.removeEnumDefByName({})", name);