You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by rw...@apache.org on 2009/04/23 05:23:59 UTC

svn commit: r767772 - /commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java

Author: rwinston
Date: Thu Apr 23 03:23:57 2009
New Revision: 767772

URL: http://svn.apache.org/viewvc?rev=767772&view=rev
Log:
NET-274: Restore socket i/o streams after CCC command

Modified:
    commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java

Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java
URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java?rev=767772&r1=767771&r2=767772&view=diff
==============================================================================
--- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java (original)
+++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/ftp/FTPSClient.java Thu Apr 23 03:23:57 2009
@@ -475,9 +475,16 @@
     @Override
     public int sendCommand(String command, String args) throws IOException {
         int repCode = super.sendCommand(command, args);
+        /* If CCC is issued, restore socket i/o streams to unsecured versions */
         if (FTPSCommand._commands[FTPSCommand.CCC].equals(command)) {
             if (FTPReply.COMMAND_OK == repCode) {
                 _socket_ = plainSocket;
+		_controlInput_ = new BufferedReader(
+				new InputStreamReader( 
+					_socket_ .getInputStream(), getControlEncoding()));
+		_controlOutput_ = new BufferedWriter(
+				new OutputStreamWriter( 
+					_socket_.getOutputStream(), getControlEncoding()));
                 setSocketFactory(null);
             } else {
                 throw new SSLException(getReplyString());