fix: Wrap TicketRouter flightInfoFor and resolve calls with wrapAsFai…

…ledExport
devinrsmith · Oct 18, 2024 · 5250fd6 · 5250fd6
1 parent 8e79f7a
commit 5250fd6
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/server/src/main/java/io/deephaven/server/session/TicketRouter.java b/server/src/main/java/io/deephaven/server/session/TicketRouter.java
@@ -71,6 +71,8 @@ public <T> SessionState.ExportObject<T> resolve(
  try (final SafeCloseable ignored = QueryPerformanceRecorder.getInstance().getNugget(
  "resolveTicket:" + ticketName)) {
  return getResolver(ticket.get(ticket.position()), logId).resolve(session, ticket, logId);
+ } catch (RuntimeException e) {
+ return SessionState.wrapAsFailedExport(e);
  }
  }
 
@@ -122,6 +124,8 @@ public <T> SessionState.ExportObject<T> resolve(
  try (final SafeCloseable ignored = QueryPerformanceRecorder.getInstance().getNugget(
  "resolveDescriptor:" + descriptor)) {
  return getResolver(descriptor, logId).resolve(session, descriptor, logId);
+ } catch (RuntimeException e) {
+ return SessionState.wrapAsFailedExport(e);
  }
  }
 
@@ -263,6 +267,8 @@ public SessionState.ExportObject<Flight.FlightInfo> flightInfoFor(
  try (final SafeCloseable ignored = QueryPerformanceRecorder.getInstance().getNugget(
  "flightInfoForDescriptor:" + descriptor)) {
  return getResolver(descriptor, logId).flightInfoFor(session, descriptor, logId);
+ } catch (RuntimeException e) {
+ return SessionState.wrapAsFailedExport(e);
  }
  }