diff options
Diffstat (limited to 'asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java')
| -rw-r--r-- | asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java index 27a21ecced..24950db916 100644 --- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java +++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/heat/ToscaResourceInstaller.java @@ -573,6 +573,8 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller { "Exception caught during installation of " + vfResourceStructure.getResourceInstance().getResourceName() + ". Transaction rollback.", e);
}
+ } finally {
+ catalogDB.close();
}
}
@@ -784,7 +786,7 @@ public class ToscaResourceInstaller {// implements IVfResourceInstaller { String providerNetwork = toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(networkNodeTemplate, SdcPropertyNames.PROPERTY_NAME_PROVIDERNETWORK_ISPROVIDERNETWORK);
- if(providerNetwork != null && providerNetwork.equalsIgnoreCase("true")){
+ if("true".equalsIgnoreCase(providerNetwork)){
networkResource.setNeutronNetworkType("PROVIDER");
} else {
networkResource.setNeutronNetworkType("BASIC");
|