Check if RequestTimeout has a value instead of ConnectTimeout during GetRequestTimeout()

Andrew Ochsner · Andrew Ochsner · commit 45a202378808 · 2015-01-19T14:29:53.000-06:00
Fixes #1203
diff --git a/src/Elasticsearch.Net/Connection/HttpConnection.cs b/src/Elasticsearch.Net/Connection/HttpConnection.cs
@@ -388,7 +388,7 @@ private void Iterate(HttpWebRequest request, byte[] data, IEnumerable<Task> asyn
 
 		private int GetRequestTimeout(IRequestConfiguration requestConfiguration)
 		{
-			if (requestConfiguration != null && requestConfiguration.ConnectTimeout.HasValue)
+			if (requestConfiguration != null && requestConfiguration.RequestTimeout.HasValue)
 				return requestConfiguration.RequestTimeout.Value;
 
 			return this.ConnectionSettings.Timeout;

Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ private void Iterate(HttpWebRequest request, byte[] data, IEnumerable<Task> asyn`
`388`	`388`
`389`	`389`	`private int GetRequestTimeout(IRequestConfiguration requestConfiguration)`
`390`	`390`	`{`
`391`		`- if (requestConfiguration != null && requestConfiguration.ConnectTimeout.HasValue)`
	`391`	`+ if (requestConfiguration != null && requestConfiguration.RequestTimeout.HasValue)`
`392`	`392`	`return requestConfiguration.RequestTimeout.Value;`
`393`	`393`
`394`	`394`	`return this.ConnectionSettings.Timeout;`