From 1b0e4f2984960f4a9f788415487981b68841c8fd Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@vmware.com>
Date: Thu, 22 Dec 2011 11:46:51 -0500
Subject: [PATCH] INT-2330 - Upgrade to Apache commons-net 3.0.1 For reference
 see: https://jira.springsource.org/browse/INT-2330

---
 build.gradle                                    |  2 +-
 spring-integration-ftp/pom.xml                  |  2 +-
 .../ftp/session/DefaultFtpsSessionFactory.java  | 17 +++++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0746731632..43224b46bd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -115,7 +115,7 @@ configure(javaprojects) {
 
     aspectjVersion = '1.6.8'
     cglibVersion = '2.2'
-    commonsNetVersion = '2.0'
+    commonsNetVersion = '3.0.1'
     easymockVersion = '2.3'
     groovyVersion = '1.8.4'
     jacksonVersion = '1.8.3'
diff --git a/spring-integration-ftp/pom.xml b/spring-integration-ftp/pom.xml
index be6837f579..64080dcfcd 100644
--- a/spring-integration-ftp/pom.xml
+++ b/spring-integration-ftp/pom.xml
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>commons-net</groupId>
       <artifactId>commons-net</artifactId>
-      <version>2.0</version>
+      <version>3.0.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java
index 12e9ed7b2d..f33fa8e07a 100644
--- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java
+++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/DefaultFtpsSessionFactory.java
@@ -17,13 +17,11 @@
 package org.springframework.integration.ftp.session;
 
 import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.TrustManager;
 
 import org.apache.commons.net.ftp.FTPSClient;
-
 import org.springframework.util.StringUtils;
 
 /**
@@ -117,8 +115,19 @@ public class DefaultFtpsSessionFactory extends AbstractFtpSessionFactory<FTPSCli
 			}
 			return new FTPSClient(this.implicit);
 		}
-		catch (NoSuchAlgorithmException e) {
-			throw new RuntimeException(e);
+		catch (Exception e) {
+		    
+			/* 
+			 This catch block is technically not necessary but it allows users 
+			 to use the older Commons Net 2.0 if necessary, which requires you 
+			 to catch a NoSuchAlgorithmException. 
+			 */
+			
+			if (e instanceof RuntimeException) {
+		        throw (RuntimeException) e;
+		    }
+		    
+			throw new RuntimeException("Failed to create FTPS client.", e);
 		}
 	}