1 files changed, 37 insertions, 36 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/jar/ExtractJar.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/jar/ExtractJar.java
index 12355573..b5390c92 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/jar/ExtractJar.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/jar/ExtractJar.java
@@ -73,17 +73,18 @@ public class ExtractJar {
 	 * @throws Exception
 	 */
 	public static void readJar(File jarFile) throws Exception {
-		JarInputStream in = new JarInputStream(new FileInputStream(jarFile));
-		JarEntry je;
-		while ((je = in.getNextJarEntry()) != null) {
-			if (je.isDirectory() == false) {
-				if (je.getName().startsWith("org/onap/portalsdk/analytics/config/")) {
-					System.out.println(je.getName() + " " + je.getTime());
-
+		try(JarInputStream in = new JarInputStream(new FileInputStream(jarFile)))
+		{
+			JarEntry je;
+			while ((je = in.getNextJarEntry()) != null) {
+				if (je.isDirectory() == false) {
+					if (je.getName().startsWith("org/onap/portalsdk/analytics/config/")) {
+						System.out.println(je.getName() + " " + je.getTime());
+	
+					}
 				}
 			}
 		}
-		in.close();
 	}
 
 	/**
@@ -95,37 +96,37 @@ public class ExtractJar {
 		Class clazz = ExtractJar.class;
 		URL jarUrl = clazz.getProtectionDomain().getCodeSource().getLocation();
 
-		JarInputStream entryStream = new JarInputStream(jarUrl.openStream());
-		JarEntry entry;
-
-		while (true) {
-			entry = entryStream.getNextJarEntry();
-			if (entry == null)
-				break;
-			if (entry.getName().indexOf("jarutil") < 0) {
-				System.out.println(entry.getName());
-				File file = new File(directory, entry.getName());
-				if (entry.isDirectory()) {
-					if (!file.exists())
-						file.mkdirs();
-				} else {
-					File dir = new File(file.getParent());
-					if (!dir.exists())
-						dir.mkdirs();
-					if (file.exists())
-						file.delete();
-					FileOutputStream fout = new FileOutputStream(file);
-					copy(entryStream, fout);
-					fout.close();
-
-					if (entry.getTime() >= 0)
-						file.setLastModified(entry.getTime());
+		try(JarInputStream entryStream = new JarInputStream(jarUrl.openStream())){
+			JarEntry entry;
+	
+			while (true) {
+				entry = entryStream.getNextJarEntry();
+				if (entry == null)
+					break;
+				if (entry.getName().indexOf("jarutil") < 0) {
+					System.out.println(entry.getName());
+					File file = new File(directory, entry.getName());
+					if (entry.isDirectory()) {
+						if (!file.exists())
+							file.mkdirs();
+					} else {
+						File dir = new File(file.getParent());
+						if (!dir.exists())
+							dir.mkdirs();
+						if (file.exists())
+							file.delete();
+						try(FileOutputStream fout = new FileOutputStream(file)){
+							copy(entryStream, fout);
+						}
+	
+						if (entry.getTime() >= 0)
+							file.setLastModified(entry.getTime());
+					}
+	
 				}
-
+				entryStream.closeEntry();
 			}
-			entryStream.closeEntry();
 		}
-		entryStream.close();
 		System.out.println("/WEB-INF/classes/org/onap/portalsdk/analytics");
 		System.out.println("Delete .... ");