ACCUMULO-2160 back-port serious findbugs/pmd issues to 1.5/1.4
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2af25155 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2af25155 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2af25155 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 2af251552e93b41875cf9d97aa927a448d7d7b00 Parents: e135e03 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Jan 10 09:16:01 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Jan 10 09:16:01 2014 -0500 ---------------------------------------------------------------------- server/base/src/main/java/org/apache/accumulo/server/Accumulo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2af25155/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java ---------------------------------------------------------------------- diff --git a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java index c546590..83f54b0 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/Accumulo.java @@ -157,7 +157,7 @@ public class Accumulo { System.setProperty("org.apache.accumulo.core.host.log.port", Integer.toString(logPort)); // Use a specific log config, if it exists - String logConfig = String.format("%s/%s_logger.xml", System.getenv("ACCUMULO_CONF_DIR")); + String logConfig = String.format("%s/%s_logger.xml", System.getenv("ACCUMULO_CONF_DIR"), application); if (!new File(logConfig).exists()) { // otherwise, use the generic config logConfig = String.format("%s/generic_logger.xml", System.getenv("ACCUMULO_CONF_DIR"));
