[jboss-svn-commits] JBL Code SVN: r38085 - labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/internal/soa/esb/util.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2012-05-11 12:18:33 -0400 (Fri, 11 May 2012)
New Revision: 38085

Modified:
   labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java
Log:
JBESB-3798
Use listFiles rather than listNames so directories are omitted.


Modified: labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java
===================================================================
--- labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java	2012-05-09 16:42:43 UTC (rev 38084)
+++ labs/jbossesb/branches/JBESB_4_11_CP/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java	2012-05-11 16:18:33 UTC (rev 38085)
@@ -31,10 +31,13 @@
 import java.io.OutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 import org.apache.log4j.Logger;
 import org.apache.commons.net.ftp.FTP;
 import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
 import org.jboss.soa.esb.ConfigurationException;
 import org.jboss.soa.esb.addressing.eprs.FTPEpr;
 import org.jboss.soa.esb.addressing.eprs.FileEpr;
@@ -362,7 +365,15 @@
                     try
                     {
                         changeRemoteDirectory() ;
-                        return m_oConn.listNames() ;
+        				ArrayList<String> matchingFiles = new ArrayList<String>();
+        				FTPFile[] files = m_oConn.listFiles();
+        				for (int i = 0; i<files.length; i++) { 
+        					if (files[i].isFile()) {
+        						matchingFiles.add(files[i].getName());
+        					}
+        				}	
+        				String[] result = Arrays.copyOf(matchingFiles.toArray(), matchingFiles.size(), String[].class);
+        				return result;
                     }
                     catch (final IOException ioe)
                     {
@@ -373,8 +384,17 @@
 
         			try
         			{
-        				changeRemoteDirectory() ;
-        				return m_oConn.listNames(sSuffix) ;
+        				changeRemoteDirectory();
+        				ArrayList<String> matchingFiles = new ArrayList<String>();
+        				FTPFile[] files = m_oConn.listFiles(sSuffix);
+        				for (int i = 0; i<files.length; i++) { 
+        					FTPFile file = files[i];
+        					if (file.isFile()) {
+	        				     matchingFiles.add(file.getName());
+        					}
+        				}
+        				String[] result = Arrays.copyOf(matchingFiles.toArray(), matchingFiles.size(), String[].class);
+        				return result;
         			}
         			catch (final IOException ioe)
         			{