Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-1356 05e58c6ee -> 838f14c5b
[LOG4J2-1354] No configuration reload is triggered under Windows when replacing the configuration file with one that has older last modified date. Refactor for clarity. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/799cb9ff Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/799cb9ff Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/799cb9ff Branch: refs/heads/LOG4J2-1356 Commit: 799cb9ff7dce9c7297c1960156d2e99acf210c85 Parents: 3bdec25 Author: ggregory <[email protected]> Authored: Tue Apr 5 11:57:54 2016 -0700 Committer: ggregory <[email protected]> Committed: Tue Apr 5 11:57:54 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/util/WatchManager.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/799cb9ff/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java index 7fc7b59..3750462 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/WatchManager.java @@ -86,7 +86,7 @@ public class WatchManager extends AbstractLifeCycle { File file = entry.getKey(); FileMonitor fileMonitor = entry.getValue(); long lastModfied = file.lastModified(); - if (fileChanged(fileMonitor, lastModfied)) { + if (fileModified(fileMonitor, lastModfied)) { logger.info("File {} was modified", file.toString()); fileMonitor.lastModified = lastModfied; fileMonitor.fileWatcher.fileModified(file); @@ -94,8 +94,8 @@ public class WatchManager extends AbstractLifeCycle { } } - private boolean fileChanged(FileMonitor fileMonitor, long lastModfied) { - return lastModfied > fileMonitor.lastModified; + private boolean fileModified(FileMonitor fileMonitor, long lastModfied) { + return lastModfied != fileMonitor.lastModified; } }
