OpenJDK / jdk / jdk10
changeset 25805:0bc2aa4aadbe
8031435: Ftp download does not work properly for ftp user without password
Reviewed-by: chegar
| author | robm |
|---|---|
| date | Fri, 01 Aug 2014 15:36:23 +0100 |
| parents | 4ae4525723a5 |
| children | 7a0cf527248e |
| files | jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java jdk/test/sun/net/ftp/FtpURL.java |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java Fri Aug 01 15:34:55 2014 +0100 +++ b/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java Fri Aug 01 15:36:23 2014 +0100 @@ -301,7 +301,7 @@ throw new IOException(fe); } try { - ftp.login(user, password.toCharArray()); + ftp.login(user, password == null ? null : password.toCharArray()); } catch (sun.net.ftp.FtpProtocolException e) { ftp.close(); // Backward compatibility
--- a/jdk/test/sun/net/ftp/FtpURL.java Fri Aug 01 15:34:55 2014 +0100 +++ b/jdk/test/sun/net/ftp/FtpURL.java Fri Aug 01 15:36:23 2014 +0100 @@ -483,7 +483,7 @@ // Now let's check the URL handler - url = new URL("ftp://user2:@localhost:" + port + "/%2Fusr/bin;type=d"); + url = new URL("ftp://user2@localhost:" + port + "/%2Fusr/bin;type=d"); con = url.openConnection(); in = new BufferedReader(new InputStreamReader(con.getInputStream())); do {