infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-04-16 18:00:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

8170222: Better transfers of files

Browse Source 
Reviewed-by: dfuchs, chegar
This commit is contained in:
Vyom Tewari 2017-02-10 10:11:10 +05:30
parent 48795d4f02
commit 1ddd69b75e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jdk/src/java.base/share/classes/sun/net/ftp/impl/FtpClient.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2009, 2017, 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
@ -516,7 +516,8 @@ public class FtpClient extends sun.net.ftp.FtpClient {
* @return <code>true</code> if the command was successful
* @throws IOException
*/
private boolean issueCommand(String cmd) throws IOException {
private boolean issueCommand(String cmd) throws IOException,
sun.net.ftp.FtpProtocolException {
if (!isConnected()) {
throw new IllegalStateException("Not connected");
}
@ -527,6 +528,12 @@ public class FtpClient extends sun.net.ftp.FtpClient {
// ignore...
}
}
if (cmd.indexOf('\n') != -1) {
sun.net.ftp.FtpProtocolException ex
= new sun.net.ftp.FtpProtocolException("Illegal FTP command");
ex.initCause(new IllegalArgumentException("Illegal carriage return"));
throw ex;
}
sendServer(cmd + "\r\n");
return readReply();
}
@ -1119,7 +1126,10 @@ public class FtpClient extends sun.net.ftp.FtpClient {
*/
public void close() throws IOException {
if (isConnected()) {
issueCommand("QUIT");
try {
issueCommand("QUIT");
} catch (FtpProtocolException e) {
}
loggedIn = false;
}
disconnect();
@ -1897,7 +1907,8 @@ public class FtpClient extends sun.net.ftp.FtpClient {
return null;
}
private boolean sendSecurityData(byte[] buf) throws IOException {
private boolean sendSecurityData(byte[] buf) throws IOException,
sun.net.ftp.FtpProtocolException {
String s = Base64.getMimeEncoder().encodeToString(buf);
return issueCommand("ADAT " + s);
}