[FAB-8024] Apply correct timeout option

d1vyank · d1vyank · commit 3c5f08a98492 · 2018-02-01T16:09:33.000-05:00
Change-Id: Ic75ef03c8f72cc125669ed79b6aed9a5ee95f62c
Signed-off-by: Divyank Katira &lt;Divyank.Katira@securekey.com&gt;
diff --git a/pkg/fabric-txn/chclient/chclient.go b/pkg/fabric-txn/chclient/chclient.go
@@ -95,7 +95,7 @@ func (cc *ChannelClient) InvokeHandler(handler chclient.Handler, request chclien
 	select {
 	case <-complete:
 		return requestContext.Response, requestContext.Error
-	case <-time.After(txnOpts.Timeout):
+	case <-time.After(requestContext.Opts.Timeout):
 		return chclient.Response{}, status.New(status.ClientStatus, status.Timeout.ToInt32(),
 			"Operation timed out", nil)
 	}

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func (cc *ChannelClient) InvokeHandler(handler chclient.Handler, request chclien`
`95`	`95`	`select {`
`96`	`96`	`case <-complete:`
`97`	`97`	`return requestContext.Response, requestContext.Error`
`98`		`- case <-time.After(txnOpts.Timeout):`
	`98`	`+ case <-time.After(requestContext.Opts.Timeout):`
`99`	`99`	`return chclient.Response{}, status.New(status.ClientStatus, status.Timeout.ToInt32(),`
`100`	`100`	`"Operation timed out", nil)`
`101`	`101`	`}`