From 79e0633593b93177f842499ca6389acd495cd29a Mon Sep 17 00:00:00 2001
From: shikha0203 <shivani.khare@est.tech>
Date: Fri, 17 Feb 2023 11:08:38 +0000
Subject: [PATCH] AttributeServlet- Add null test before using nullable values

Issue-ID: SDC-4396
Signed-off-by: shikha0203 <shivani.khare@est.tech>
Change-Id: I41f9e072f9caa601c3a135e0d3205b9676638e8b
---
 .../main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java
index 6ea2ab1096..4056d607ad 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/servlets/AttributeServlet.java
@@ -115,6 +115,10 @@ public class AttributeServlet extends AbstractValidationsServlet {
         try {
             final Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
             AttributeDefinition attributeDataDefinition = convertJsonToObject(data, errorWrapper);
+            if (attributeDataDefinition == null) {
+                log.error("Unexpected null value for `attributeDataDefinition`");
+                return buildErrorResponse(errorWrapper.getInnerElement());
+            }
             if (errorWrapper.isEmpty()) {
                 AttributeBusinessLogic businessLogic = getClassFromWebAppContext(context, () -> AttributeBusinessLogic.class);
                 Either<AttributeDefinition, ResponseFormat> createAttribute = businessLogic
@@ -175,6 +179,10 @@ public class AttributeServlet extends AbstractValidationsServlet {
         try {
             final Wrapper<ResponseFormat> errorWrapper = new Wrapper<>();
             AttributeDefinition attributeDataDefinition = convertJsonToObject(data, errorWrapper);
+            if (attributeDataDefinition == null) {
+                log.error("Unexpected null value for `attributeDataDefinition`");
+                return buildErrorResponse(errorWrapper.getInnerElement());
+            }
             if (errorWrapper.isEmpty()) {
                 AttributeBusinessLogic businessLogic = getClassFromWebAppContext(context, () -> AttributeBusinessLogic.class);
                 Either<AttributeDefinition, ResponseFormat> eitherUpdateAttribute = businessLogic
-- 
2.16.6