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

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

Author: mark.little at jboss.com
Date: 2007-10-18 12:33:56 -0400 (Thu, 18 Oct 2007)
New Revision: 15923

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
Log:
http://jira.jboss.com/jira/browse/JBESB-1178

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java	2007-10-18 16:29:18 UTC (rev 15922)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/util/EdtFtpImpl.java	2007-10-18 16:33:56 UTC (rev 15923)
@@ -70,6 +70,7 @@
 	private boolean m_bPassive;
 
 	private int m_iPort;
+	private int _timeout = 0;
 
 	private FTPClient m_oConn = new FTPClient();
 
@@ -171,6 +172,22 @@
 			_logger.warn(e);
 		}
 
+		String timeout = ModulePropertyManager.getPropertyManager(ModulePropertyManager.TRANSPORTS_MODULE).getProperty(Environment.FTP_SOCKET_TIMEOUT, null);
+		
+		if (timeout != null)
+		{
+			try
+			{
+				_timeout = Integer.parseInt(timeout);
+			}
+			catch (NumberFormatException ex)
+			{
+				throw new ConfigurationException("Invalid timeout specified.", ex);
+			}
+		}
+		else
+			_timeout = 0;
+
 		// TODO there is still a bit of space for improvements here.
 		configTreeFromEpr();
 
@@ -430,6 +447,18 @@
 				m_oConn
 						.setConnectMode((m_bPassive) ? FTPConnectMode.PASV : FTPConnectMode.ACTIVE);
 				m_oConn.setType(m_oXferType);
+				
+				if (_timeout > 0)
+				{
+					try
+					{ 
+						m_oConn.setTimeout(_timeout); 
+					}
+					catch (IOException e)
+					{ 
+						throw new RemoteFileSystemException("Failed while setting timeout=" + _timeout, e); 
+					}
+				}
 			}
 			catch (IOException ex)
 			{

Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-10-18 16:29:18 UTC (rev 15922)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-10-18 16:33:56 UTC (rev 15923)
@@ -44,6 +44,7 @@
 	
 	public static final String FTP_LOCALDIR  = "org.jboss.soa.esb.ftp.localdir";
 	public static final String FTP_REMOTEDIR = "org.jboss.soa.esb.ftp.remotedir";
+	public static final String FTP_SOCKET_TIMEOUT = "org.jboss.soa.esb.ftp.timeout";
 	
 	public static final String JMS_CONNECTION_POOL_SIZE = "org.jboss.soa.esb.jms.connectionPool";
 	public static final String JMS_SESSION_SLEEP        = "org.jboss.soa.esb.jms.sessionSleep";