[jboss-svn-commits] JBL Code SVN: r22752 - in labs/jbossesb/trunk/product/rosetta/src/org/jboss: soa/esb/util and 1 other directory.

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

Author: mark.little at jboss.com
Date: 2008-09-14 04:49:15 -0400 (Sun, 14 Sep 2008)
New Revision: 22752

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java
Log:
https://jira.jboss.org/jira/browse/JBESB-1995 (fixed some potential logic bombs).

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java	2008-09-14 08:48:29 UTC (rev 22751)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/FtpImpl.java	2008-09-14 08:49:15 UTC (rev 22752)
@@ -255,6 +255,9 @@
                 }
                 else
                     renameRetry = DEFAULT_RENAME_RETRY_NUMBER;
+                
+                if (renameRetry < 1)
+                    renameRetry = 1;
         }
 
         protected void configTreeFromEpr () throws RemoteFileSystemException
@@ -617,13 +620,16 @@
                     }
                     else
                     {
-                        try
+                        if (i+1 < renameRetry)
                         {
-                            Thread.sleep(DEFAULT_RENAME_RETRY_TIMEOUT);
+                            try
+                            {
+                                Thread.sleep(DEFAULT_RENAME_RETRY_TIMEOUT);
+                            }
+                            catch (final Exception ex)
+                            {
+                            }
                         }
-                        catch (final Exception ex)
-                        {
-                        }
                     }
                 }
                 

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java	2008-09-14 08:48:29 UTC (rev 22751)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/FtpClientUtil.java	2008-09-14 08:49:15 UTC (rev 22752)
@@ -382,13 +382,16 @@
                             }
                             else
                             {
-                                try
+                                if (i+1 < renameRetry)
                                 {
-                                    Thread.sleep(RemoteFileSystem.DEFAULT_RENAME_RETRY_TIMEOUT);
+                                    try
+                                    {
+                                        Thread.sleep(RemoteFileSystem.DEFAULT_RENAME_RETRY_TIMEOUT);
+                                    }
+                                    catch (final Exception ex)
+                                    {
+                                    }
                                 }
-                                catch (final Exception ex)
-                                {
-                                }
                             }
                         }
 
@@ -523,6 +526,9 @@
                 }
                 else
                     renameRetry = RemoteFileSystem.DEFAULT_RENAME_RETRY_NUMBER;
+                
+                if (renameRetry < 1)
+                    renameRetry = 1;
         } // __________________________________
 
         public static String fileToFtpString (File p_oF)