Code style fixes
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/183fbf23 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/183fbf23 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/183fbf23 Branch: refs/heads/LOG4J2-1010&LOG4J2-1447-injectable-contextdata&better-datastructure Commit: 183fbf23944256f7ba3a38315077f0368e76c460 Parents: f8b86f5 Author: Aleksey Zvolinsky <[email protected]> Authored: Thu Aug 4 12:15:07 2016 +0300 Committer: Gary Gregory <[email protected]> Committed: Mon Aug 29 10:20:55 2016 -0700 ---------------------------------------------------------------------- .../core/appender/routing/IdlePurgePolicy.java | 10 +++++----- .../core/appender/routing/RoutingAppender.java | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/183fbf23/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java index 9fee717..e2b818e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/IdlePurgePolicy.java @@ -63,7 +63,7 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R @Override public void stop() { super.stop(); - if(future != null) { + if (future != null) { future.cancel(true); } } @@ -77,7 +77,7 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R for (final Entry<String, Long> entry : appendersUsage.entrySet()) { if (entry.getValue() < createTime) { LOGGER.debug("Removing appender " + entry.getKey()); - if(appendersUsage.remove(entry.getKey(), entry.getValue())) { + if (appendersUsage.remove(entry.getKey(), entry.getValue())) { routingAppender.deleteAppender(entry.getKey()); } } @@ -153,17 +153,17 @@ public class IdlePurgePolicy extends AbstractLifeCycle implements PurgePolicy, R } long ttl = units.toMillis(Long.parseLong(timeToLive)); - if(ttl < 0) { + if (ttl < 0) { LOGGER.error("timeToLive must be positive. timeToLive set to 0"); ttl = 0; } long ci; - if(checkInterval == null) { + if (checkInterval == null) { ci = ttl; } else { ci = units.toMillis(Long.parseLong(checkInterval)); - if(ci < 0) { + if (ci < 0) { LOGGER.error("checkInterval must be positive. checkInterval set equal to timeToLive = {}", ttl); ci = ttl; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/183fbf23/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java index 059413d..7e11254 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/routing/RoutingAppender.java @@ -52,7 +52,7 @@ public final class RoutingAppender extends AbstractAppender { private final Configuration config; private final ConcurrentMap<String, AppenderControl> appenders = new ConcurrentHashMap<>(); private final RewritePolicy rewritePolicy; - private final PurgePolicy purgePolicy; + private final PurgePolicy purgePolicy; private RoutingAppender(final String name, final Filter filter, final boolean ignoreExceptions, final Routes routes, final RewritePolicy rewritePolicy, final Configuration config, final PurgePolicy purgePolicy) { @@ -61,8 +61,8 @@ public final class RoutingAppender extends AbstractAppender { this.config = config; this.rewritePolicy = rewritePolicy; this.purgePolicy = purgePolicy; - if(this.purgePolicy != null) { - this.purgePolicy.initialize(this); + if (this.purgePolicy != null) { + this.purgePolicy.initialize(this); } Route defRoute = null; for (final Route route : routes.getRoutes()) { @@ -117,12 +117,12 @@ public final class RoutingAppender extends AbstractAppender { control.callAppender(event); } - if(purgePolicy != null) { - purgePolicy.update(key, event); + if (purgePolicy != null) { + purgePolicy.update(key, event); } } - private synchronized AppenderControl getControl(final String key, final LogEvent event) { + private synchronized AppenderControl getControl(final String key, final LogEvent event) { AppenderControl control = appenders.get(key); if (control != null) { return control; @@ -173,8 +173,8 @@ public final class RoutingAppender extends AbstractAppender { } public Map<String, AppenderControl> getAppenders() { - return Collections.unmodifiableMap(appenders); - } + return Collections.unmodifiableMap(appenders); + } /** * Delete specified appender @@ -186,8 +186,8 @@ public final class RoutingAppender extends AbstractAppender { AppenderControl control = appenders.remove(key); control.getAppender().stop(); LOGGER.debug("Deleting route with " + key + " key "); - AppenderControl control = appenders.remove(key); - if(null != control) { + final AppenderControl control = appenders.remove(key); + if (null != control) { LOGGER.debug("Stopping route with " + key + " key"); control.getAppender().stop(); } else {
