svn commit: r1423929 - /camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java

[da...@apache.org]

Author: davsclaus
Date: Wed Dec 19 16:38:32 2012
New Revision: 1423929

URL: http://svn.apache.org/viewvc?rev=1423929&view=rev
Log:
CAMEL-5899: Netty producer should at most wait for connection timeout to get a connection.

Modified:
    camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java

Modified: camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java?rev=1423929&r1=1423928&r2=1423929&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java (original)
+++ camel/trunk/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyProducer.java Wed Dec 19 16:38:32 2012
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.AsyncCallback;
 import org.apache.camel.CamelContext;
@@ -374,8 +375,8 @@ public class NettyProducer extends Defau
             }
         });
         // blocking for channel to be done
-        LOG.trace("Waiting for operation to complete {}", channelFuture);
-        latch.await();
+        LOG.trace("Waiting for operation to complete {} for {} millis", channelFuture, configuration.getConnectTimeout());
+        latch.await(configuration.getConnectTimeout(), TimeUnit.MILLISECONDS);
 
         if (!channelFuture.isSuccess()) {
             throw new CamelException("Cannot connect to " + configuration.getAddress(), channelFuture.getCause());