accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/6] accumulo git commit: ACCUMULO-4436 Make sure that all processes get tagged for cleanup that are executed via MAC
Date Wed, 31 Aug 2016 21:23:39 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.7 8a3cc4f04 -> f1ffe5918
  refs/heads/1.8 55795c1ca -> 2c50d63d9
  refs/heads/master cca8b896e -> 5e730f9ff


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.7
Commit: f1ffe5918944e2d3f82ec9a6a5b4bf372698fa3f
Parents: 8a3cc4f
Author: Josh Elser <elserj@apache.org>
Authored: Wed Aug 31 13:45:21 2016 -0400
Committer: Josh Elser <elserj@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;
   }
 


Mime
View raw message