Fix race condition in FTP close

Author: ViRb3

ftp/src/main/java/ch/cyberduck/core/ftp/FTPClient.java

@@ -59,6 +59,7 @@ public class FTPClient extends FTPSClient {
     private final SSLSocketFactory sslSocketFactory;
 
     private Protocol protocol;
+    public Socket dataSocket;
 
     /**
      * Map of FEAT responses. If null, has not been initialised.
@@ -89,6 +90,7 @@ protected Socket _openDataConnection_(final String command, final String arg) th
 
     @Override
     protected void _prepareDataSocket_(final Socket socket) {
+        this.dataSocket = socket;
         if(preferences.getBoolean("ftp.tls.session.requirereuse")) {
             if(socket instanceof SSLSocket) {
                 // Control socket is SSL

ftp/src/main/java/ch/cyberduck/core/ftp/FTPReadFeature.java

@@ -101,7 +101,7 @@ public void close() throws IOException {
                 return;
             }
             try {
-                super.close();
+                session.getClient().dataSocket.shutdownOutput();
                 if(session.isConnected()) {
                     // Read 226 status after closing stream
                     int reply = session.getClient().getReply();
@@ -122,6 +122,7 @@ else if(!status.isComplete()) {
                 }
             }
             finally {
+                super.close();
                 close.set(true);
             }
         }

ftp/src/main/java/ch/cyberduck/core/ftp/FTPWriteFeature.java

@@ -92,7 +92,7 @@ public void close() throws IOException {
                 return;
             }
             try {
-                super.close();
+                session.getClient().dataSocket.shutdownOutput();
                 if(session.isConnected()) {
                     // Read 226 status after closing stream
                     if(!FTPReply.isPositiveCompletion(session.getClient().getReply())) {
@@ -112,6 +112,7 @@ else if(!status.isComplete()) {
                 }
             }
             finally {
+                super.close();
                 close.set(true);
             }
         }