archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8255078: sun/net/ftp/imp/FtpClient$MLSxParser uses wrong datetime format

Browse source 
Reviewed-by: dfuchs
This commit is contained in:
Igor Ignatyev 2020-10-23 22:31:18 +00:00
parent 3f6abd220f
commit 6545e19fcc
2 changed files with 219 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -289,9 +289,6 @@ public class FtpClient extends sun.net.ftp.FtpClient {
}
private class MLSxParser implements FtpDirParser {
private SimpleDateFormat df = new SimpleDateFormat("yyyyMMddhhmmss");
public FtpDirEntry parseLine(String line) {
String name = null;
int i = line.lastIndexOf(';');
@ -326,22 +323,14 @@ public class FtpClient extends sun.net.ftp.FtpClient {
}
s = file.getFact("Modify");
if (s != null) {
Date d = null;
try {
d = df.parse(s);
} catch (ParseException ex) {
}
Date d = parseRfc3659TimeValue(s);
if (d != null) {
file.setLastModified(d);
}
}
s = file.getFact("Create");
if (s != null) {
Date d = null;
try {
d = df.parse(s);
} catch (ParseException ex) {
}
Date d = parseRfc3659TimeValue(s);
if (d != null) {
file.setCreated(d);
}
@ -1749,15 +1738,17 @@ public class FtpClient extends sun.net.ftp.FtpClient {
}
return -1;
}
private static String[] MDTMformats = {
"yyyyMMddHHmmss.SSS",
"yyyyMMddHHmmss"
};
private static SimpleDateFormat[] dateFormats = new SimpleDateFormat[MDTMformats.length];
private static final SimpleDateFormat[] dateFormats;
static {
for (int i = 0; i < MDTMformats.length; i++) {
dateFormats[i] = new SimpleDateFormat(MDTMformats[i]);
String[] formats = {
"yyyyMMddHHmmss.SSS",
"yyyyMMddHHmmss"
};
dateFormats = new SimpleDateFormat[formats.length];
for (int i = 0; i < formats.length; ++i) {
dateFormats[i] = new SimpleDateFormat(formats[i]);
dateFormats[i].setTimeZone(TimeZone.getTimeZone("GMT"));
}
}
@ -1778,20 +1769,25 @@ public class FtpClient extends sun.net.ftp.FtpClient {
issueCommandCheck("MDTM " + path);
if (lastReplyCode == FtpReplyCode.FILE_STATUS) {
String s = getResponseString().substring(4);
Date d = null;
for (SimpleDateFormat dateFormat : dateFormats) {
try {
d = dateFormat.parse(s);
} catch (ParseException ex) {
}
if (d != null) {
return d;
}
}
return parseRfc3659TimeValue(s);
}
return null;
}
private static Date parseRfc3659TimeValue(String s) {
Date d = null;
for (SimpleDateFormat dateFormat : dateFormats) {
try {
d = dateFormat.parse(s);
} catch (ParseException ex) {
}
if (d != null) {
return d;
}
}
return d;
}
/**
* Sets the parser used to handle the directory output to the specified
* one. By default the parser is set to one that can handle most FTP