diff options
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system')
2 files changed, 11 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/AntBuild.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/AntBuild.java index e9a03eec..cc038cab 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/AntBuild.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/AntBuild.java @@ -57,8 +57,9 @@ public class AntBuild { } public static void readManifest() { + JarFile jar = null; try { - JarFile jar = new JarFile("./raptor_fusion.jar"); + jar = new JarFile("./raptor_fusion.jar"); Manifest manifest = jar.getManifest(); Attributes attribs = manifest.getMainAttributes(); @@ -80,6 +81,14 @@ public class AntBuild { } catch (IOException e) { System.err.println("Cannot read jar-file manifest: " + e.getMessage()); + } finally { + if (jar != null) { + try { + jar.close(); + } catch (IOException e) { + throw new RuntimeException("Failed to close jar '"); + } + } } } }
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/Lookup.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/Lookup.java index ff5fc276..f5447289 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/Lookup.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/Lookup.java @@ -93,7 +93,7 @@ public class Lookup extends FusionVo implements Serializable { boolean equivalent = false; Lookup lookup = (Lookup)obj; - if( lookup.getValue().equals(getValue()) && lookup.getLabel().equals(getLabel())) { + if(lookup!=null && lookup.getValue().equals(getValue()) && lookup.getLabel().equals(getLabel())) { equivalent = true; } |