From c2c4ba8fd9711a813630e2378169e760eed6af1a Mon Sep 17 00:00:00 2001
From: Saravanan Raju <saravanan.footloose@gmail.com>
Date: Wed, 22 Jan 2020 15:27:38 +0530
Subject: [PATCH]   ISSUE-653 : Fix NPE while deleting schema metadata with no
 schema versions

---
 .../registries/schemaregistry/DefaultSchemaRegistry.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/schema-registry/core/src/main/java/com/hortonworks/registries/schemaregistry/DefaultSchemaRegistry.java b/schema-registry/core/src/main/java/com/hortonworks/registries/schemaregistry/DefaultSchemaRegistry.java
index 6c1dfb689..0b738523a 100644
--- a/schema-registry/core/src/main/java/com/hortonworks/registries/schemaregistry/DefaultSchemaRegistry.java
+++ b/schema-registry/core/src/main/java/com/hortonworks/registries/schemaregistry/DefaultSchemaRegistry.java
@@ -308,7 +308,8 @@ public void deleteSchema(String schemaName) throws SchemaNotFoundException {
             }
         }
         // Remove all serdes mappings for this schema name
-        Collection<SchemaSerDesMapping> schemaSerDesMappings = getSchemaSerDesMappings(schemaMetadataId);
+        SchemaMetadataInfo schemaMetadataInfo = getSchemaMetadataInfo(schemaName);
+        Collection<SchemaSerDesMapping> schemaSerDesMappings = getSchemaSerDesMappings(schemaMetadataInfo.getId());
         if (schemaSerDesMappings != null) {
             for (SchemaSerDesMapping schemaSerDesMapping: schemaSerDesMappings) {
                 storageManager.remove(schemaSerDesMapping.getStorableKey());