# HG changeset patch
# User vtewari
# Date 1459974708 -3600
# Node ID 83319fc2c7ac82af7d95efb0337a40d0866e7804
# Parent  cbe79e75273417ca3cb6b4c0d9e49011c9b351c3
8151586: Wrong exception catch for FTPClient in JDK-8055032
Reviewed-by: chegar

diff -r cbe79e752734 -r 83319fc2c7ac jdk/src/java.base/share/classes/sun/net/TransferProtocolClient.java
--- a/jdk/src/java.base/share/classes/sun/net/TransferProtocolClient.java	Wed Apr 06 17:54:41 2016 +0200
+++ b/jdk/src/java.base/share/classes/sun/net/TransferProtocolClient.java	Wed Apr 06 21:31:48 2016 +0100
@@ -83,7 +83,7 @@
                     code = Integer.parseInt(response, 0, 3, 10);
                 } catch (NumberFormatException e) {
                     code = -1;
-                } catch (StringIndexOutOfBoundsException e) {
+                } catch (IndexOutOfBoundsException e) {
                     /* this line doesn't contain a response code, so
                        we just completely ignore it */
                     continue;
diff -r cbe79e752734 -r 83319fc2c7ac jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
--- a/jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java	Wed Apr 06 17:54:41 2016 +0200
+++ b/jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java	Wed Apr 06 21:31:48 2016 +0100
@@ -440,7 +440,7 @@
                     code = Integer.parseInt(response, 0, 3, 10);
                 } catch (NumberFormatException e) {
                     code = -1;
-                } catch (StringIndexOutOfBoundsException e) {
+                } catch (IndexOutOfBoundsException e) {
                     /* this line doesn't contain a response code, so
                     we just completely ignore it */
                     continue;
diff -r cbe79e752734 -r 83319fc2c7ac jdk/test/sun/net/www/ftptest/FtpCommandHandler.java
--- a/jdk/test/sun/net/www/ftptest/FtpCommandHandler.java	Wed Apr 06 17:54:41 2016 +0200
+++ b/jdk/test/sun/net/www/ftptest/FtpCommandHandler.java	Wed Apr 06 21:31:48 2016 +0100
@@ -442,7 +442,9 @@
             // cmd.setSoTimeout(2000);
             in = new BufferedReader(new InputStreamReader(cmd.getInputStream()));
             out = new PrintStream(cmd.getOutputStream(), true, "ISO8859_1");
-            out.println("220 Java FTP test server (j2se 6.0) ready.");
+            out.println("---------------------------------\n220 Java FTP test server"
+                    + " (j2se 6.0) ready.\n \n                Please send commands\n"
+                    + "-----------------------------\n\n\n");
             out.flush();
             if (auth.authType() == 0) // No auth needed
                 logged = true;