ATLAS-1672: fix for issues flagged by Coverity scan

repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityChangeNotifier.java

@@ -231,8 +231,14 @@ public class AtlasEntityChangeNotifier {
         if (StringUtils.isEmpty(entityId) || CollectionUtils.isEmpty(classifications)) {
             return;
         }
+
         AtlasVertex atlasVertex = AtlasGraphUtilsV1.findByGuid(entityId);
 
+        if (atlasVertex == null) {
+            LOG.warn("updateFullTextMapping(): no entity exists with guid {}", entityId);
+            return;
+        }
+
         try {
             String classificationFullText = fullTextMapperV2.getIndexTextForClassifications(entityId, classifications);
             String existingFullText = (String) GraphHelper.getProperty(atlasVertex, Constants.ENTITY_TEXT_PROPERTY_KEY);
@@ -250,4 +256,4 @@ public class AtlasEntityChangeNotifier {
 
         doFullTextMapping(Collections.singletonList(entityHeader));
     }
-}
+}
\ No newline at end of file

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

@@ -196,7 +196,8 @@ public class ZipSource implements EntityImportStream {
 
     private AtlasEntity getEntity(String guid) throws AtlasBaseException {
         if(guidEntityJsonMap.containsKey(guid)) {
-            return getEntityWithExtInfo(guid).getEntity();
+            AtlasEntityWithExtInfo extInfo = getEntityWithExtInfo(guid);
+            return (extInfo != null) ? extInfo.getEntity() : null;
         }
 
         return null;