summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrupaNagabhushan <krupa.nagabhushan@est.tech>2020-08-10 13:27:50 +0100
committerSébastien Determe <sebastien.determe@intl.att.com>2020-09-07 05:34:30 +0000
commitea03a0147fb4e52f818a9823278f5f2f69e63da2 (patch)
treeb51df0865273a7e884864fb2f93dde9de6e2243d
parent5886110d78dfd3bf95a506c67a194716056cf8a2 (diff)
Adjusting check condition for ZipOutputStream
Issue-ID: SDC-3226 Signed-off-by: KrupaNagabhushan <krupa.nagabhushan@est.tech> Change-Id: I49e8916e23a7883832a02e6f294fd3f2a537f3a2
-rw-r--r--catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
index 241148b531..f378ca0288 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/tosca/CsarUtils.java
@@ -278,8 +278,10 @@ public class CsarUtils {
}
//UID <cassandraId,filename,component>
- Either<ZipOutputStream, ResponseFormat> responseFormat = getZipOutputStreamResponseFormatEither(zip, dependencies);
- if (responseFormat != null) return responseFormat;
+ Either<ZipOutputStream, ResponseFormat> zipOutputStreamOrResponseFormat = getZipOutputStreamResponseFormatEither(zip, dependencies);
+ if (zipOutputStreamOrResponseFormat != null && zipOutputStreamOrResponseFormat.isRight()) {
+ return zipOutputStreamOrResponseFormat;
+ }
//retrieve SDC.zip from Cassandra
Either<byte[], ResponseFormat> latestSchemaFilesFromCassandra = getLatestSchemaFilesFromCassandra();