diff options
| author |   luxin <luxin7@huawei.com> | 2018-02-11 15:09:13 +0800 |
|---|---|---|
| committer | luxin <luxin7@huawei.com> | 2018-02-11 15:24:19 +0800 |
| commit | 277abfdf9bfd9a2e342584fc6f4700a25534d7f2 (patch) | |
| tree | 12387668bcc72f85d5cc8c80f2000f07545a29ab /ResmanagementService/service/src/main | |
| parent | 86e1ac9541a1dd6bfe6d1e3c7a4b9b679a26b904 (diff) | |
UT case increase for grant resource
Change-Id: Ia077192aa8cc4b781fc1b107debcdad158ac6f13
Issue-ID: VFC-747
Signed-off-by: luxin <luxin7@huawei.com>
Diffstat (limited to 'ResmanagementService/service/src/main')
2 files changed, 5 insertions, 0 deletions
diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java index d9e8867..fbd779d 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/common/VimUtil.java @@ -73,6 +73,9 @@ public class VimUtil { */ public static String getVimIdByName(String name) { JSONArray vims = getVims(); + if(vims == null) { + return ""; + } for(int i = 0; i < vims.size(); i++) { JSONObject vim = vims.getJSONObject(i); LOG.info("vimInfo: " + vim); diff --git a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java index ead1f5d..2feaba3 100644 --- a/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java +++ b/ResmanagementService/service/src/main/java/org/onap/vfc/nfvo/resmanagement/service/adapter/impl/ResmgrAdapterMgrService.java @@ -166,6 +166,8 @@ public class ResmgrAdapterMgrService implements IResmgrAdapterMgrService { } } catch(InterruptedException e) { LOG.error(e.getMessage(), e); + // Restore interrupted state... + Thread.currentThread().interrupt(); } sendRequest(this.paramsMap, this.adapterInfo); |