Repository: incubator-apex-core Updated Branches: refs/heads/release-3.3 781daa75b -> ac95e0584
APEXCORE-385 make sure to clean up temp app package directories Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/ac95e058 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ac95e058 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ac95e058 Branch: refs/heads/release-3.3 Commit: ac95e05845067c97f7872442792b56b9f1ac7ed9 Parents: 781daa7 Author: David Yan <[email protected]> Authored: Mon Mar 14 18:37:12 2016 -0700 Committer: Thomas Weise <[email protected]> Committed: Mon Mar 14 19:14:41 2016 -0700 ---------------------------------------------------------------------- .../java/com/datatorrent/stram/cli/DTCli.java | 28 +++----------------- .../datatorrent/stram/client/AppPackage.java | 2 +- 2 files changed, 5 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ac95e058/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java b/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java index 09812e6..395f719 100644 --- a/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java +++ b/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java @@ -2881,10 +2881,7 @@ public class DTCli public void execute(String[] args, ConsoleReader reader) throws Exception { String jarfile = expandFileName(args[1], true); - AppPackage ap = null; - try { - ap = newAppPackageInstance(new File(jarfile)); - + try (AppPackage ap = newAppPackageInstance(new File(jarfile))) { List<AppInfo> applications = ap.getApplications(); if (args.length >= 3) { @@ -2911,8 +2908,6 @@ public class DTCli } printJson(appList, "applications"); } - } finally { - IOUtils.closeQuietly(ap); } } @@ -3414,17 +3409,12 @@ public class DTCli @Override public void execute(String[] args, ConsoleReader reader) throws Exception { - AppPackage ap = null; - try { - ap = newAppPackageInstance(new File(expandFileName(args[1], true))); + try (AppPackage ap = newAppPackageInstance(new File(expandFileName(args[1], true)))) { JSONSerializationProvider jomp = new JSONSerializationProvider(); JSONObject apInfo = new JSONObject(jomp.getContext(null).writeValueAsString(ap)); apInfo.remove("name"); printJson(apInfo); } - finally { - IOUtils.closeQuietly(ap); - } } } @@ -3743,9 +3733,7 @@ public class DTCli String[] tmpArgs = new String[args.length - 1]; System.arraycopy(args, 1, tmpArgs, 0, args.length - 1); GetOperatorClassesCommandLineInfo commandLineInfo = getGetOperatorClassesCommandLineInfo(tmpArgs); - AppPackage ap = null; - try { - ap = newAppPackageInstance(new File(expandFileName(commandLineInfo.args[0], true))); + try (AppPackage ap = newAppPackageInstance(new File(expandFileName(commandLineInfo.args[0], true)))){ List<String> newArgs = new ArrayList<String>(); List<String> jars = new ArrayList<String>(); for (String jar : ap.getAppJars()) { @@ -3767,9 +3755,6 @@ public class DTCli new GetJarOperatorClassesCommand().execute(newArgs.toArray(new String[]{}), reader); } - finally { - IOUtils.closeQuietly(ap); - } } } @@ -3779,9 +3764,7 @@ public class DTCli @Override public void execute(String[] args, ConsoleReader reader) throws Exception { - AppPackage ap = null; - try { - ap = newAppPackageInstance(new File(expandFileName(args[1], true))); + try (AppPackage ap = newAppPackageInstance(new File(expandFileName(args[1], true)))) { List<String> newArgs = new ArrayList<String>(); List<String> jars = new ArrayList<String>(); for (String jar : ap.getAppJars()) { @@ -3795,9 +3778,6 @@ public class DTCli newArgs.add(args[2]); new GetJarOperatorPropertiesCommand().execute(newArgs.toArray(new String[]{}), reader); } - finally { - IOUtils.closeQuietly(ap); - } } } http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ac95e058/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java ---------------------------------------------------------------------- diff --git a/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java b/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java index ada57e5..9367bef 100644 --- a/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java +++ b/engine/src/main/java/com/datatorrent/stram/client/AppPackage.java @@ -124,6 +124,7 @@ public class AppPackage extends JarFile cleanOnClose = true; contentFolder = Files.createTempDirectory("dt-appPackage-").toFile(); } + directory = contentFolder; Manifest manifest = getManifest(); if (manifest == null) { @@ -141,7 +142,6 @@ public class AppPackage extends JarFile throw new IOException("Not a valid app package. App Package Name or Version or Class-Path is missing from MANIFEST.MF"); } classPath.addAll(Arrays.asList(StringUtils.split(classPathString, " "))); - directory = contentFolder; extractToDirectory(directory, file); if (processAppDirectory) { processAppDirectory(new File(directory, "app"));
