You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2016/03/15 03:14:06 UTC
[1/2] incubator-apex-core git commit: APEXCORE-385 make sure to clean
up temp app package directories
Repository: incubator-apex-core
Updated Branches:
refs/heads/master fb04f62dd -> d421a5abd
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/2a16d10d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/2a16d10d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/2a16d10d
Branch: refs/heads/master
Commit: 2a16d10da1e6ee69108c52736f50da85d2ab1161
Parents: 7c84e05
Author: David Yan <da...@datatorrent.com>
Authored: Mon Mar 14 18:37:12 2016 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Mon Mar 14 18:37:12 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/2a16d10d/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 9e0a1fc..083b5ab 100644
--- a/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java
+++ b/engine/src/main/java/com/datatorrent/stram/cli/DTCli.java
@@ -2886,10 +2886,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) {
@@ -2916,8 +2913,6 @@ public class DTCli
}
printJson(appList, "applications");
}
- } finally {
- IOUtils.closeQuietly(ap);
}
}
@@ -3419,17 +3414,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);
- }
}
}
@@ -3749,9 +3739,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()) {
@@ -3773,9 +3761,6 @@ public class DTCli
new GetJarOperatorClassesCommand().execute(newArgs.toArray(new String[]{}), reader);
}
- finally {
- IOUtils.closeQuietly(ap);
- }
}
}
@@ -3785,9 +3770,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()) {
@@ -3801,9 +3784,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/2a16d10d/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"));
[2/2] incubator-apex-core git commit: Merge branch 'APEXCORE-385' of
https://github.com/davidyan74/incubator-apex-core
Posted by th...@apache.org.
Merge branch 'APEXCORE-385' of https://github.com/davidyan74/incubator-apex-core
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/d421a5ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/d421a5ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/d421a5ab
Branch: refs/heads/master
Commit: d421a5abdb4e13c80d6cb1c5c5c75a37f9036249
Parents: fb04f62 2a16d10
Author: Thomas Weise <th...@datatorrent.com>
Authored: Mon Mar 14 19:12:16 2016 -0700
Committer: Thomas Weise <th...@datatorrent.com>
Committed: Mon Mar 14 19:12:16 2016 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/cli/DTCli.java | 28 +++-----------------
.../datatorrent/stram/client/AppPackage.java | 2 +-
2 files changed, 5 insertions(+), 25 deletions(-)
----------------------------------------------------------------------