File tree Expand file tree Collapse file tree 1 file changed +4
-2
lines changed
scala-client/src/main/scala-2/com/couchbase/client/scala Expand file tree Collapse file tree 1 file changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -500,7 +500,8 @@ class AsyncCollection(
500500
501501 import scala .jdk .CollectionConverters ._
502502
503- val results = scala.concurrent.Await .result(futureList, options.timeout)
503+ val awaitTimeout = if (options.timeout == Duration .MinusInf ) kvReadTimeout else options.timeout
504+ val results = scala.concurrent.Await .result(futureList, awaitTimeout)
504505 results.asScala.toSeq.map(res =>
505506 Future .successful(convertReplica(res, environment, options.transcoder))
506507 )
@@ -600,7 +601,8 @@ class AsyncCollection(
600601
601602 import scala .jdk .CollectionConverters ._
602603
603- val results = scala.concurrent.Await .result(futureList, options.timeout)
604+ val awaitTimeout = if (options.timeout == Duration .MinusInf ) kvReadTimeout else options.timeout
605+ val results = scala.concurrent.Await .result(futureList, awaitTimeout)
604606 results.asScala.toSeq.map(res => Future .successful(convertLookupInReplica(res, environment)))
605607 }
606608
You can’t perform that action at this time.
0 commit comments