You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2016/08/31 21:23:40 UTC
[2/6] accumulo git commit: ACCUMULO-4436 Make sure that all processes
get tagged for cleanup that are executed via MAC
ACCUMULO-4436 Make sure that all processes get tagged for cleanup that are executed via MAC
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1ffe591
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1ffe591
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f1ffe591
Branch: refs/heads/1.8
Commit: f1ffe5918944e2d3f82ec9a6a5b4bf372698fa3f
Parents: 8a3cc4f
Author: Josh Elser <el...@apache.org>
Authored: Wed Aug 31 13:45:21 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Aug 31 17:13:03 2016 -0400
----------------------------------------------------------------------
.../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1ffe591/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 95ac79a..653c600 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -200,9 +200,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
jvmArgs2.add("-Xmx" + config.getDefaultMemory());
if (jvmArgs != null)
jvmArgs2.addAll(jvmArgs);
- Process proc = _exec(clazz, jvmArgs2, args);
- cleanup.add(proc);
- return proc;
+ return _exec(clazz, jvmArgs2, args);
}
private boolean containsSiteFile(File f) {
@@ -338,6 +336,8 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
logWriters.add(lw);
lw.start();
+ cleanup.add(process);
+
return process;
}