100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Bug fix for configurable production CORS filter
Rich Turnerfe070d3d3b9d
diff --git a/container/src/main/java/org/openremote/container/web/WebService.java b/container/src/main/java/org/openremote/container/web/WebService.javaindex 5589631d1..0e4385352 100644--- a/container/src/main/java/org/openremote/container/web/WebService.java+++ b/container/src/main/java/org/openremote/container/web/WebService.java@@ -295,6 +295,8 @@ public abstract class WebService implements ContainerService {corsFilter.setCorsMaxAge(1209600);}- corsFilterInfo = Servlets.filter("CORS Filter", CORSFilter.class, () -> new ImmediateInstanceHandle<>(corsFilter));+ if (corsFilter != null) {+ corsFilterInfo = Servlets.filter("CORS Filter", CORSFilter.class, () -> new ImmediateInstanceHandle<>(corsFilter));+ }}}diff --git a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.javaindex 8b64d5ccb..5044d7f73 100644--- a/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java+++ b/manager/src/main/java/org/openremote/manager/datapoint/AssetDatapointResourceImpl.java@@ -53,7 +53,7 @@ public class AssetDatapointResourceImpl extends ManagerWebResource implements As}@Override- public ValueDatapoint<Value>[] getDatapoints(@BeanParam RequestParams requestParams,+ public ValueDatapoint[] getDatapoints(@BeanParam RequestParams requestParams,String assetId,String attributeName,DatapointInterval interval,