diff options
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); |