commit 6f98c7426c13aeae55d3bf46ef0c93e8e24a8929
author Tal Gitelman <tg851x@intl.att.com> Mon Oct 22 10:25:50 2018 +0300
committer Michael Lando <michael.lando@intl.att.com> Tue Oct 23 13:53:55 2018 +0000
tree 762e0657ce1c315668768d8a4694f01199be3dd7
parent 9ffdb63f01a939b09a24a3d49d700d71948bd1a7

fix a sonar NullPointerException issue in ABL

Change-Id: I3ee02af56d3073f1e68cefd2a6503cb804af3ffb
Issue-ID: SDC-1831
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
index 65260c1..62f62f1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/impl/ArtifactsBusinessLogic.java
@@ -4803,17 +4803,11 @@
                 log.debug(FAILED_UPLOAD_ARTIFACT_TO_COMPONENT, componentType, componentUuid, actionResult
                         .right()
                         .value());
-                errorWrapper.setInnerElement(actionResult.right().value());
+                return Either.right(actionResult.right().value());
             }
+            return Either.left(actionResult.left().value().left().value());
         }
-        if (errorWrapper.isEmpty()) {
-            uploadArtifact = actionResult.left().value().left().value();
-            uploadArtifactResult = Either.left(uploadArtifact);
-        }
-        else {
-            uploadArtifactResult = Either.right(errorWrapper.getInnerElement());
-        }
-        return uploadArtifactResult;
+        return Either.right(errorWrapper.getInnerElement());
     }
     /**
      * upload an artifact to a resource instance by UUID