From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Fri, 16 Feb 2018 08:36:24 +0000 (+0530)
Subject: Make sure the streams are closed properly - vnfm
X-Git-Tag: v1.1.0~119
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=8ba7c5e18eb8859aa1e2148ce5cdb7ae75789de5;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

Make sure the streams are closed properly - vnfm

Issue-ID: VFC-764

Change-Id: I5cff574c18268c81dbd4607cd327f775e629c500
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java
index f31d5a5d..858df17d 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfResourceMgr.java
@@ -110,7 +110,7 @@ public class VnfResourceMgr {
         RestfulResponse rsp = VnfmRestfulUtil.getRemoteResponse(ParamConstants.GRANT_RES_URL, VnfmRestfulUtil.TYPE_PUT,
                 grantParam.toString());
         if(rsp == null || rsp.getStatus() != Constant.HTTP_OK) {
-            return null;
+            return new JSONObject();
         }
         LOG.error("funtion=sendGrantToResmgr, status={}", rsp.getStatus());
         return JSONObject.fromObject(rsp.getResponseContent());