Fixed FileServlet GET on resource root causing NPE

Signed-off-by: Alberto Codutti <alberto.codutti@eurotech.com>
eclipse · Jan 26, 2021 · 1ee15ec · 1ee15ec
1 parent e48e138
commit 1ee15ec
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/FileServlet.java b/console/core/src/main/java/org/eclipse/kapua/app/console/core/servlet/FileServlet.java
@@ -13,15 +13,17 @@
 package org.eclipse.kapua.app.console.core.servlet;
 
 import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.CharEncoding;
 import org.eclipse.kapua.KapuaEntityNotFoundException;
 import org.eclipse.kapua.KapuaIllegalAccessException;
 import org.eclipse.kapua.KapuaIllegalArgumentException;
 import org.eclipse.kapua.KapuaUnauthenticatedException;
+import org.eclipse.kapua.app.console.core.shared.model.KapuaFormFields;
 import org.eclipse.kapua.app.console.module.api.server.KapuaRemoteServiceServlet;
 import org.eclipse.kapua.app.console.module.api.setting.ConsoleSetting;
 import org.eclipse.kapua.app.console.module.api.setting.ConsoleSettingKeys;
 import org.eclipse.kapua.app.console.module.api.shared.model.GwtXSRFToken;
-import org.eclipse.kapua.app.console.core.shared.model.KapuaFormFields;
 import org.eclipse.kapua.commons.model.id.KapuaEid;
 import org.eclipse.kapua.locator.KapuaLocator;
 import org.eclipse.kapua.service.device.management.command.DeviceCommandFactory;
@@ -30,9 +32,6 @@
 import org.eclipse.kapua.service.device.management.command.DeviceCommandOutput;
 import org.eclipse.kapua.service.device.management.configuration.DeviceConfigurationManagementService;
 import org.eclipse.kapua.service.device.management.exception.DeviceManagementException;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.CharEncoding;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -237,6 +236,11 @@ public void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         String reqPathInfo = request.getPathInfo();
 
+        if (reqPathInfo == null) {
+            response.sendError(404);
+            return;
+        }
+
         if (reqPathInfo.startsWith("/icons")) {
             doGetIconResource(request, response);
         } else {