Merge pull request #530 from Netcentric/bugfix/521-fix-null-pointer-in-ui

#521 Avoid null pointer exception in case PID biz.netcentric.cq.tools.actool.impl.AcInstallationServiceImpl is not configured

Author: ghenzler

accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImpl.java

@@ -197,7 +197,9 @@ public InstallationLog apply(String configurationRootPath, String[] restrictedTo
     public InstallationLog apply(String configurationRootPath, String[] restrictedToPaths, boolean skipIfConfigUnchanged) {
 
         if(StringUtils.isBlank(configurationRootPath)) {
-            if(configurationRootPaths.size() == 1) {
+            if(CollectionUtils.isEmpty(configurationRootPaths)) {
+                throw new IllegalArgumentException("Configuration root path neither configured nor provided.");
+            } else if(configurationRootPaths.size() == 1) {
                 configurationRootPath = configurationRootPaths.get(0);
             } else {
                 return applyMultipleConfigurations(restrictedToPaths, skipIfConfigUnchanged);

accesscontroltool-bundle/src/main/java/biz/netcentric/cq/tools/actool/ui/AcToolUiService.java

@@ -4,7 +4,6 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
@@ -316,7 +315,7 @@ static RequestParameters fromRequest(HttpServletRequest req, AcInstallationServi
                     Boolean.valueOf(req.getParameter(AcToolUiService.PARAM_APPLY_ONLY_IF_CHANGED)));
             return result;
         }
-
+        
         final String configurationRootPath;
         final List<String> basePaths;
         final int showLogNo;
@@ -346,7 +345,7 @@ static String getParam(final HttpServletRequest req, final String name, final St
             if (result == null) {
                 result = defaultValue;
             }
-            return result.trim();
+            return StringUtils.trim(result);
         }
 
     }