Implemented PR suggestions

dlmarion · Jan 13, 2025 · dc5e2c3 · dc5e2c3
1 parent b685237
commit dc5e2c3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCache.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCache.java
@@ -533,13 +533,10 @@ public void clear(Predicate<String> pathPredicate) {
     Preconditions.checkState(!closed);
     Predicate<String> pathPredicateToUse;
     if (log.isTraceEnabled()) {
-      pathPredicateToUse = path -> {
-        boolean testResult = pathPredicate.test(path);
-        if (testResult) {
-          log.trace("removing {} from cache", path);
-        }
-        return testResult;
-      };
+      pathPredicateToUse = pathPredicate.and(path -> {
+        log.trace("removing {} from cache", path);
+        return true;
+      });
     } else {
       pathPredicateToUse = pathPredicate;
     }

diff --git a/...cluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java b/...cluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
@@ -280,8 +280,6 @@ public synchronized void stop(ServerType server, String hostname) throws IOExcep
           try {
             cluster.stopProcessWithTimeout(managerProcess, 30, TimeUnit.SECONDS);
             try {
-              System.setProperty("accumulo.properties",
-                  "file://" + cluster.getAccumuloPropertiesPath());
               new ZooZap().zap(cluster.getServerContext().getSiteConfiguration(),
                   new String[] {"-manager"});
             } catch (Exception e) {

diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
@@ -835,7 +835,6 @@ public synchronized void stop() throws IOException, InterruptedException {
     // is restarted, then the processes will start right away
     // and not wait for the old locks to be cleaned up.
     try {
-      System.setProperty("accumulo.properties", "file://" + getAccumuloPropertiesPath());
       new ZooZap().zap(getServerContext().getSiteConfiguration(), new String[] {"-manager",
           "-compaction-coordinators", "-tservers", "-compactors", "-sservers"});
     } catch (Exception e) {