This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-vfs.git
The following commit(s) were added to refs/heads/master by this push:
new 76c758d Better method name.
new b21d324 Merge branch 'master' of
https://gitbox.apache.org/repos/asf/commons-vfs
76c758d is described below
commit 76c758db31392626ab1d2ab0971f278e251d00a4
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Dec 17 14:19:38 2020 -0500
Better method name.
---
.../java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
index c141789..d766faf 100644
---
a/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
+++
b/commons-vfs2/src/main/java/org/apache/commons/vfs2/provider/ftp/FtpFileObject.java
@@ -315,11 +315,11 @@ public class FtpFileObject extends
AbstractFileObject<FtpFileSystem> {
final FileObject linkDest = getLinkDestination();
// VFS-437: Try to avoid a recursion loop.
if (this.isCircular(linkDest)) {
- return getTimestamp();
+ return getTimestampMillis();
}
return linkDest.getContent().getLastModifiedTime();
}
- return getTimestamp();
+ return getTimestampMillis();
}
}
@@ -531,7 +531,7 @@ public class FtpFileObject extends
AbstractFileObject<FtpFileSystem> {
return relPath;
}
- private long getTimestamp() {
+ private long getTimestampMillis() {
final Calendar timestamp = this.ftpFile != null ?
this.ftpFile.getTimestamp() : null;
return timestamp == null ? DEFAULT_TIMESTAMP :
timestamp.getTime().getTime();
}