--- a/jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java	Mon Jul 18 10:27:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java	Mon Jul 18 13:57:59 2016 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
@@ -1707,7 +1707,7 @@
      */
     public InputStream nameList(String path) throws sun.net.ftp.FtpProtocolException, IOException {
         Socket s;
-        s = openDataConnection("NLST " + path);
+        s = openDataConnection(path == null ? "NLST" : "NLST " + path);
         if (s != null) {
             return createInputStream(s.getInputStream());
         }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/sun/net/ftp/TestFtpClientNameListWithNull.java	Mon Jul 18 13:57:59 2016 +0300
@@ -0,0 +1,142 @@
+/*
+ * Copyright (c) 2016, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8022580
+ * @summary "null" should be treated as "current directory" in nameList()
+ * method of FtpClient
+ * @modules java.base/sun.net.ftp
+ * @run main TestFtpClientNameListWithNull
+*/
+
+
+import sun.net.ftp.FtpClient;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+
+
+public class TestFtpClientNameListWithNull {
+
+    private static volatile boolean commandHasArgs;
+
+    public static void main(String[] args) throws Exception {
+        try (FtpServer server = new FtpServer();
+             FtpClient client = FtpClient.create()) {
+            (new Thread(server)).start();
+            int port = server.getPort();
+            client.connect(new InetSocketAddress("localhost", port));
+            client.nameList(null);
+        } finally {
+            if (commandHasArgs) {
+                throw new RuntimeException("Test failed. NLST shouldn't have " +
+                        "args if nameList parameter is null");
+            }
+        }
+    }
+
+    private static class FtpServer implements AutoCloseable, Runnable {
+        private final ServerSocket serverSocket;
+
+        FtpServer() throws IOException {
+            serverSocket = new ServerSocket(0);
+        }
+
+        public void handleClient(Socket client) throws IOException {
+            boolean done = false;
+            String str;
+
+            client.setSoTimeout(2000);
+            BufferedReader in = new BufferedReader(new InputStreamReader(client.
+                    getInputStream()));
+            PrintWriter out = new PrintWriter(client.getOutputStream(), true);
+            out.println("220 FTP serverSocket is ready.");
+            while (!done) {
+                try {
+                    str = in.readLine();
+                } catch (SocketException e) {
+                    done = true;
+                    continue;
+                }
+                String cmd = str.substring(0, str.indexOf(" ") > 0 ?
+                        str.indexOf(" ") : str.length());
+                String args = (cmd.equals(str)) ?
+                        "" : str.substring(str.indexOf(" "));
+                switch (cmd) {
+                    case "QUIT":
+                        out.println("221 Goodbye.");
+                        out.flush();
+                        done = true;
+                        break;
+                    case "EPSV":
+                        if ("all".equalsIgnoreCase(args)) {
+                            out.println("200 EPSV ALL command successful.");
+                            continue;
+                        }
+                        out.println("229 Entering Extended Passive Mode " +
+                                "(|||" + getPort() + "|)");
+                        break;
+                    case "NLST":
+                        if (args.trim().length() != 0) {
+                            commandHasArgs = true;
+                        }
+                        out.println("200 Command okay.");
+                        break;
+                    default:
+                        out.println("500 unsupported command: " + str);
+                }
+            }
+        }
+
+        public int getPort() {
+            if (serverSocket != null) {
+                return serverSocket.getLocalPort();
+            }
+            return 0;
+        }
+
+        public void close() throws IOException {
+            if (serverSocket != null && !serverSocket.isClosed()) {
+                serverSocket.close();
+            }
+        }
+
+        @Override
+        public void run() {
+            try {
+                try (Socket client = serverSocket.accept()) {
+                    handleClient(client);
+                }
+            } catch (IOException e) {
+                throw new RuntimeException("Problem in test execution", e);
+            }
+        }
+    }
+}