ATLAS-1305 Fix potential NPEs in instance conversion code(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-1305 Fix potential NPEs in instance conversion code (sumasai)
 ATLAS-1349 Reduce excessive exception logging (apoorvnaik via svimal2106)
 ATLAS-1343 CTAS query is not captured by Atlas with Hive2 (svimal2106)
 ATLAS-1337 fixed FalconHookIT (ayubpathan via mneethiraj)

webapp/src/main/java/org/apache/atlas/web/rest/EntityREST.java

@@ -393,7 +393,7 @@ public class EntityREST {
      */
     private void validateUniqueAttribute(AtlasEntityType entityType, String attributeName) throws AtlasBaseException {
         AtlasStructDef.AtlasAttributeDef attribute = entityType.getAttributeDef(attributeName);
-        if (!attribute.getIsUnique()) {
+        if (attribute != null && !attribute.getIsUnique()) {
             throw new AtlasBaseException(AtlasErrorCode.ATTRIBUTE_UNIQUE_INVALID, entityType.getTypeName(), attributeName);
         }
     }

webapp/src/test/java/org/apache/atlas/web/resources/TypedefsJerseyResourceIT.java

@@ -337,7 +337,7 @@ public class TypedefsJerseyResourceIT extends BaseResourceIT {
                 } else if (typeDef.getCategory() == TypeCategory.ENTITY) {
                     byGuid = clientV2.getEntityByGuid(typeDef.getGuid());
                 } else if (typeDef.getCategory() == TypeCategory.CLASSIFICATION) {
-                    byGuid = clientV2.getClassificationByGuid(typeDef.getName());
+                    byGuid = clientV2.getClassificationByGuid(typeDef.getGuid());
                 } else if (typeDef.getCategory() == TypeCategory.STRUCT) {
                     byGuid = clientV2.getStructByGuid(typeDef.getGuid());
                 }