From 96c0091bdeb10fbe6296a0dcee75f82930dded9e Mon Sep 17 00:00:00 2001
From: Rob McKenna <robm@openjdk.org>
Date: Fri, 1 Aug 2014 15:36:23 +0100
Subject: [PATCH] 8031435: Ftp download does not work properly for ftp user
 without password

Reviewed-by: chegar
---
 .../classes/sun/net/www/protocol/ftp/FtpURLConnection.java      | 2 +-
 jdk/test/sun/net/ftp/FtpURL.java                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java b/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
index ee7684deb9d..d787ab3df1a 100644
--- a/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
+++ b/jdk/src/share/classes/sun/net/www/protocol/ftp/FtpURLConnection.java
@@ -301,7 +301,7 @@ public class FtpURLConnection extends URLConnection {
             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
diff --git a/jdk/test/sun/net/ftp/FtpURL.java b/jdk/test/sun/net/ftp/FtpURL.java
index 117913f6a63..64c4e8fc890 100644
--- a/jdk/test/sun/net/ftp/FtpURL.java
+++ b/jdk/test/sun/net/ftp/FtpURL.java
@@ -483,7 +483,7 @@ public class FtpURL {
 
             // 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 {