Catch PatternSyntaxException and return badRequest

hawkular · Aug 13, 2015 · 62c5c5c · 62c5c5c
1 parent 411a812
commit 62c5c5c
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...ics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java b/...ics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.regex.PatternSyntaxException;
 
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
@@ -105,11 +106,13 @@ public Response findMetrics(
 
         try {
             return metricObservable
-                .map(MetricDefinition::new)
-                .toList()
-                .map(ApiUtils::collectionToResponse)
-                .toBlocking()
-                .lastOrDefault(null);
+                    .map(MetricDefinition::new)
+                    .toList()
+                    .map(ApiUtils::collectionToResponse)
+                    .toBlocking()
+                    .lastOrDefault(null);
+        } catch (PatternSyntaxException e) {
+            return ApiUtils.badRequest(e);
         } catch (Exception e) {
             return ApiUtils.serverError(e);
         }