Skip to content

Commit 479b2a7

Browse files
committed
avoid indefinite wait on future
1 parent 2db4852 commit 479b2a7

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

xds/src/main/java/io/grpc/xds/XdsServerWrapper.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@
7272
import java.util.concurrent.ExecutionException;
7373
import java.util.concurrent.ScheduledExecutorService;
7474
import java.util.concurrent.TimeUnit;
75+
import java.util.concurrent.TimeoutException;
7576
import java.util.concurrent.atomic.AtomicBoolean;
7677
import java.util.concurrent.atomic.AtomicReference;
7778
import java.util.logging.Level;
@@ -169,8 +170,8 @@ public void run() {
169170
});
170171
Exception exception;
171172
try {
172-
exception = initialStartFuture.get();
173-
} catch (InterruptedException | ExecutionException e) {
173+
exception = initialStartFuture.get(5000, TimeUnit.MILLISECONDS);
174+
} catch (InterruptedException | ExecutionException | TimeoutException e) {
174175
throw new RuntimeException(e);
175176
}
176177
if (exception != null) {

0 commit comments

Comments
 (0)