[jboss-svn-commits] JBL Code SVN: r16217 - labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway.

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

Author: tfennelly
Date: 2007-10-31 15:02:20 -0400 (Wed, 31 Oct 2007)
New Revision: 16217

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1286

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java	2007-10-31 18:58:08 UTC (rev 16216)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/AbstractFileGateway.java	2007-10-31 19:02:20 UTC (rev 16217)
@@ -126,6 +126,10 @@
         File[] fileList;
         try {
             fileList = getFileList();
+            if(fileList == null) {
+                _logger.warn("No files to process.");
+                return;
+            }
         }
         catch (GatewayException e) {
             _logger.error("Can't retrieve file list", e);

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java	2007-10-31 18:58:08 UTC (rev 16216)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/listeners/gateway/FileGatewayListener.java	2007-10-31 19:02:20 UTC (rev 16217)
@@ -121,16 +121,26 @@
             * Input suffix is not null.
             */
 
-            return _inputDirectory.listFiles(_inputFileFilter);
+            return filterFiles(_inputDirectory, _inputFileFilter);
         } else {
             /*
             * Input suffix is null so ignore any worker files.
             */
 
-            return _inputDirectory.listFiles(_ignoreFileFilter);
+            return filterFiles(_inputDirectory, _ignoreFileFilter);
         }
     }
 
+    private File[] filterFiles(File dir, FileFilter filter) {
+        File[] files = dir.listFiles(filter);
+
+        if(files == null) {
+            _logger.warn("Error applying file filter '" + filter + "' to directory '" + dir.getAbsolutePath() + "'.  Null file list returned.  Invalid directory, or IO error reading directory.");
+        }
+
+        return files;
+    }
+
     @Override
     boolean renameFile(File from, File to) throws GatewayException {
         if (to.exists() && !to.delete()) {