InvalidEce

cryostatio · Sep 27, 2023 · 5021c0b · 5021c0b
1 parent d899df2
commit 5021c0b
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/main/java/io/cryostat/agent/remote/RecordingsContext.java b/src/main/java/io/cryostat/agent/remote/RecordingsContext.java
@@ -235,11 +235,12 @@ private void handleStartRecordingOrSnapshot(HttpExchange exchange) throws IOExce
                 | ServiceNotAvailableException
                 | FlightRecorderException
                 | org.openjdk.jmc.rjmx.services.jfr.FlightRecorderException
-                | InvalidEventTemplateException
                 | InvalidXmlException
                 | IOException e) {
             log.error("Failed to start recording", e);
             exchange.sendResponseHeaders(HttpStatus.SC_INTERNAL_SERVER_ERROR, BODY_LENGTH_NONE);
+        } catch (InvalidEventTemplateException e) {
+            exchange.sendResponseHeaders(HttpStatus.SC_BAD_REQUEST, BODY_LENGTH_NONE);
         }
     }
 
@@ -421,7 +422,13 @@ private SerializableRecordingDescriptor startRecording(StartRecordingRequest req
                         localStorageTemplateService.addTemplate(
                                 new ByteArrayInputStream(
                                         req.template.getBytes(StandardCharsets.UTF_8)));
-                events = localStorageTemplateService.getEvents(template).orElseThrow();
+                events =
+                        localStorageTemplateService
+                                .getEvents(template)
+                                .orElseThrow(
+                                        () ->
+                                                new InvalidEventTemplateException(
+                                                        "Falied to retrieve recording events"));
                 cleanup =
                         () -> {
                             try {
@@ -435,7 +442,10 @@ private SerializableRecordingDescriptor startRecording(StartRecordingRequest req
                         new RemoteTemplateService(conn)
                                 .getEvents(req.localTemplateName, TemplateType.TARGET).stream()
                                         .findFirst()
-                                        .orElseThrow();
+                                        .orElseThrow(
+                                                () ->
+                                                        new InvalidEventTemplateException(
+                                                                "Failed to retrieve recording events"));
             }
             IFlightRecorderService svc = conn.getService();
             return new SerializableRecordingDescriptor(