From 0b289bad570b99942b8323d2357806ae859c006b Mon Sep 17 00:00:00 2001
From: Devin Smith <devinsmith@deephaven.io>
Date: Fri, 27 Oct 2023 11:06:53 -0700
Subject: [PATCH] Make Barrage URI resolver return a Table (#4732)

Fixes #4730
---
 .../io/deephaven/server/uri/BarrageTableResolver.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/io/deephaven/server/uri/BarrageTableResolver.java b/server/src/main/java/io/deephaven/server/uri/BarrageTableResolver.java
index 6cdd22f8261..962264b6687 100644
--- a/server/src/main/java/io/deephaven/server/uri/BarrageTableResolver.java
+++ b/server/src/main/java/io/deephaven/server/uri/BarrageTableResolver.java
@@ -3,6 +3,7 @@
  */
 package io.deephaven.server.uri;
 
+import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.client.impl.*;
 import io.deephaven.client.impl.TableHandle.TableHandleException;
 import io.deephaven.configuration.Configuration;
@@ -31,6 +32,7 @@
 import java.net.URI;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -103,11 +105,13 @@ public boolean isResolvable(URI uri) {
     }
 
     @Override
-    public Future<Table> resolve(URI uri) throws InterruptedException {
+    public Table resolve(URI uri) throws InterruptedException {
         try {
-            return subscribe(RemoteUri.of(uri));
+            return subscribe(RemoteUri.of(uri)).get();
         } catch (TableHandleException e) {
             throw e.asUnchecked();
+        } catch (ExecutionException e) {
+            throw new UncheckedDeephavenException(e);
         }
     }