Merge pull request #121 from jcacciatore/bugfix-timeout-value

Bug fix for issue # 51 (#51)
Netflix · Jul 22, 2016 · 00551e7 · 00551e7
2 parents 3aa32e2 + 7fcf4af
commit 00551e7
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/dyno-core/src/main/java/com/netflix/dyno/connectionpool/impl/ConnectionPoolImpl.java b/dyno-core/src/main/java/com/netflix/dyno/connectionpool/impl/ConnectionPoolImpl.java
@@ -443,7 +443,7 @@ public <R> Collection<OperationResult<R>> executeWithRing(Operation<CL, R> op) t
 	 * @return
 	 */
 	public <R> Connection<CL> getConnectionForOperation(BaseOperation<CL, R> baseOperation) {
-		return selectionStrategy.getConnection(baseOperation, cpConfiguration.getConnectTimeout(), TimeUnit.MILLISECONDS);
+		return selectionStrategy.getConnection(baseOperation, cpConfiguration.getMaxTimeoutWhenExhausted(), TimeUnit.MILLISECONDS);
 	}
 
 	@Override