You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/11/26 15:56:01 UTC
[42/50] logging-log4j2 git commit: LOG4J2-435 added method
isFollowSymbolicLinks; use Paths.get to create path instances
LOG4J2-435 added method isFollowSymbolicLinks; use Paths.get to create
path instances
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6a1a2af0
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6a1a2af0
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6a1a2af0
Branch: refs/heads/LOG4J2-435-delete-on-rollover
Commit: 6a1a2af01a6404884b647d81ec61d01a702a6fe5
Parents: a5bb1d2
Author: rpopma <rp...@apache.org>
Authored: Thu Nov 26 23:40:51 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Nov 26 23:40:51 2015 +0900
----------------------------------------------------------------------
.../appender/rolling/action/AbstractPathAction.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6a1a2af0/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
index 1a82d13..e66f543 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/action/AbstractPathAction.java
@@ -18,11 +18,11 @@
package org.apache.logging.log4j.core.appender.rolling.action;
import java.io.IOException;
-import java.nio.file.FileSystems;
import java.nio.file.FileVisitOption;
import java.nio.file.FileVisitor;
import java.nio.file.Files;
import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
@@ -103,7 +103,7 @@ public abstract class AbstractPathAction extends AbstractAction {
* @return the base path (all lookups resolved)
*/
public Path getBasePath() {
- return FileSystems.getDefault().getPath(subst.replace(getBasePathString()));
+ return Paths.get(subst.replace(getBasePathString()));
}
/**
@@ -127,6 +127,15 @@ public abstract class AbstractPathAction extends AbstractAction {
public Set<FileVisitOption> getOptions() {
return Collections.unmodifiableSet(options);
}
+
+ /**
+ * Returns whether to follow symbolic links or not.
+ *
+ * @return whether to follow symbolic links or not
+ */
+ public boolean isFollowSymbolicLinks() {
+ return options.contains(FileVisitOption.FOLLOW_LINKS);
+ }
/**
* Returns the the maximum number of directory levels to visit.