Skip to content

Commit 11483fe

Browse files
committed
SCBC-492: getAllReplicas and lookupInAllReplicas now require timeouts
Fixing a 3.9.0 regression. Change-Id: Ia0af4b53b061b5d32330183fbc012aff8545a327 Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/232106 Tested-by: Build Bot <[email protected]> Reviewed-by: David Nault <[email protected]>
1 parent 002cdca commit 11483fe

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

scala-client/src/main/scala-2/com/couchbase/client/scala/AsyncCollection.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)