commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1091601 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
Date Tue, 12 Apr 2011 23:39:11 GMT
Author: sebb
Date: Tue Apr 12 23:39:11 2011
New Revision: 1091601

URL: http://svn.apache.org/viewvc?rev=1091601&view=rev
Log:
NET-404 FTPSSocketFactory does not override createSocket(); causes java.net.SocketException:
Unconnected sockets not implemented

Modified:
    commons/proper/net/trunk/src/changes/changes.xml
    commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java

Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1091601&r1=1091600&r2=1091601&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml (original)
+++ commons/proper/net/trunk/src/changes/changes.xml Tue Apr 12 23:39:11 2011
@@ -85,6 +85,9 @@ KeyManagerUtils can be used to provide c
 
   All users are recommended to upgrade.
 ">
+            <action issue="NET-404" dev="sebb" type="fix">
+            FTPSSocketFactory does not override createSocket(); causes java.net.SocketException:
Unconnected sockets not implemented.
+            </action>
             <action issue="NET-399" dev="sebb" type="fix" due-to="Noah Levitt">
             ftp data connection does not use connectTimeout.
             </action>

Modified: commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java?rev=1091601&r1=1091600&r2=1091601&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
(original)
+++ commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/FTPSSocketFactory.java
Tue Apr 12 23:39:11 2011
@@ -39,6 +39,12 @@ public class FTPSSocketFactory extends S
         this.context = context;
     }
 
+    // Override the default implementation
+    @Override
+    public Socket createSocket() throws IOException{
+        return this.context.getSocketFactory().createSocket();
+    }
+
     @Override
     public Socket createSocket(String address, int port) throws UnknownHostException, IOException
{
         return this.context.getSocketFactory().createSocket(address, port);



Mime
View raw message