Description

src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java

@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.validation.DirectFieldBindingResult;
 import org.springframework.validation.Errors;
@@ -39,6 +40,7 @@ import com.google.common.collect.Lists;
 import ch.psi.daq.common.ordering.Ordering;
 import ch.psi.daq.domain.backend.Backend;
 import ch.psi.daq.domain.config.DomainConfig;
+import ch.psi.daq.domain.events.ChannelConfiguration;
 import ch.psi.daq.domain.json.ChannelName;
 import ch.psi.daq.domain.query.DAQConfigQuery;
 import ch.psi.daq.domain.query.DAQConfigQueryElement;
@@ -176,12 +178,23 @@ public class QueryRestController implements ApplicationContextAware {
          produces = {MediaType.APPLICATION_JSON_VALUE})
    public void getChannelConfiguration(@RequestBody final ChannelName channelName, final HttpServletResponse res)
          throws Throwable {
-      ((AbstractHTTPResponse) defaultResponse).respond(
-            context,
-            res,
-            null,
-            queryManager.getChannelConfiguration(channelName),
-            historicConfigFormatter);
+      try {
+         final ChannelConfiguration config = queryManager.getChannelConfiguration(channelName);
+
+         if (config != null) {
+            ((AbstractHTTPResponse) defaultResponse).respond(
+                  context,
+                  res,
+                  null,
+                  config,
+                  historicConfigFormatter);
+         } else {
+            res.setStatus(HttpStatus.NOT_FOUND.value());
+         }
+      } catch (Throwable t) {
+         LOGGER.warn("Failed to get channel configuration.", t);
+         throw t;
+      }
    }
 
    @RequestMapping(