You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/05/10 15:27:37 UTC

svn commit: r655081 - /activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java

Author: davsclaus
Date: Sat May 10 06:27:37 2008
New Revision: 655081

URL: http://svn.apache.org/viewvc?rev=655081&view=rev
Log:
CAMEL-396: connect timeout is now default 30 seconds or the value the user has provided for timeout

Modified:
    activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java

Modified: activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java?rev=655081&r1=655080&r2=655081&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java (original)
+++ activemq/camel/trunk/components/camel-mina/src/main/java/org/apache/camel/component/mina/MinaComponent.java Sat May 10 06:27:37 2008
@@ -67,6 +67,8 @@
 public class MinaComponent extends DefaultComponent<MinaExchange> {
     private static final transient Log LOG = LogFactory.getLog(MinaComponent.class);
 
+    private static final long DEFAULT_CONNECT_TIMEOUT = 30000;
+
     // encoder used for datagram
     private CharsetEncoder encoder;
 
@@ -124,7 +126,9 @@
         if (minaLogger) {
             connectorConfig.getFilterChain().addLast("logger", new LoggingFilter());
         }
-        // TODO: CAMEL-396 override connector timeout to either default or timeout provided by end user: connectorConfig.setConnectTimeout();
+        // set connect timeout to mina in seconds
+        long connectTimeout = timeout > 0 ? timeout : DEFAULT_CONNECT_TIMEOUT;
+        connectorConfig.setConnectTimeout((int)(connectTimeout / 1000));
 
         // acceptor connectorConfig
         SocketAcceptorConfig acceptorConfig = new SocketAcceptorConfig();
@@ -186,7 +190,9 @@
         if (minaLogger) {
             connectorConfig.getFilterChain().addLast("logger", new LoggingFilter());
         }
-        // TODO: CAMEL-396 override connector timeout to either default or timeout provided by end user: connectorConfig.setConnectTimeout();
+        // set connect timeout to mina in seconds
+        long connectTimeout = timeout > 0 ? timeout : DEFAULT_CONNECT_TIMEOUT;
+        connectorConfig.setConnectTimeout((int)(connectTimeout / 1000));
 
         DatagramAcceptorConfig acceptorConfig = new DatagramAcceptorConfig();
         configureDataGramCodecFactory("MinaConsumer", acceptorConfig, parameters);