Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Check app directory exists in deployment before creating app file request handler

Rich Turner68ed5ba29e02
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
index 34704f1af..9aa84fe75 100644
--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
@@ -37,6 +37,7 @@ import org.openremote.container.web.jsapi.JSAPIServlet;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.UriBuilder;
import java.net.URI;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Collection;
@@ -128,14 +129,16 @@ public class ManagerWebService extends WebService {
appDocRoot = Paths.get(getString(container.getConfig(), APP_DOCROOT, APP_DOCROOT_DEFAULT));
uiDocRoot = Paths.get(getString(container.getConfig(), UI_DOCROOT, UI_DOCROOT_DEFAULT));
HttpHandler uiFileHandler = createFileHandler(devMode, identityService, uiDocRoot, null);
- HttpHandler appBaseFileHandler = createFileHandler(devMode, identityService, appDocRoot, null);
+ HttpHandler appBaseFileHandler = Files.isDirectory(appDocRoot) ? createFileHandler(devMode, identityService, appDocRoot, null) : null;
// Default app file handler to use index.html
HttpHandler appFileHandler = exchange -> {
if (exchange.getRelativePath().isEmpty() || "/".equals(exchange.getRelativePath())) {
exchange.setRelativePath("/index.html");
}
- appBaseFileHandler.handleRequest(exchange);
+ if (appBaseFileHandler != null) {
+ appBaseFileHandler.handleRequest(exchange);
+ }
};
// TODO: Remove this once GWT client is replaced