Skip to content

Commit a23973f

Browse files
committed
#521 Avoid null pointer exception in case PID
biz.netcentric.cq.tools.actool.impl.AcInstallationServiceImpl is not configured
1 parent 3edd2ba commit a23973f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ public InstallationLog apply(String configurationRootPath, String[] restrictedTo
197197
public InstallationLog apply(String configurationRootPath, String[] restrictedToPaths, boolean skipIfConfigUnchanged) {
198198

199199
if(StringUtils.isBlank(configurationRootPath)) {
200-
if(configurationRootPaths.size() == 1) {
200+
if(CollectionUtils.isEmpty(configurationRootPaths)) {
201+
throw new IllegalArgumentException("Configuration root path neither configured nor provided.");
202+
} else if(configurationRootPaths.size() == 1) {
201203
configurationRootPath = configurationRootPaths.get(0);
202204
} else {
203205
return applyMultipleConfigurations(restrictedToPaths, skipIfConfigUnchanged);

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import java.io.IOException;
66
import java.io.PrintWriter;
7-
import java.io.UnsupportedEncodingException;
87
import java.net.URLEncoder;
98
import java.nio.charset.StandardCharsets;
109
import java.text.SimpleDateFormat;
@@ -316,7 +315,7 @@ static RequestParameters fromRequest(HttpServletRequest req, AcInstallationServi
316315
Boolean.valueOf(req.getParameter(AcToolUiService.PARAM_APPLY_ONLY_IF_CHANGED)));
317316
return result;
318317
}
319-
318+
320319
final String configurationRootPath;
321320
final List<String> basePaths;
322321
final int showLogNo;
@@ -346,7 +345,7 @@ static String getParam(final HttpServletRequest req, final String name, final St
346345
if (result == null) {
347346
result = defaultValue;
348347
}
349-
return result.trim();
348+
return StringUtils.trim(result);
350349
}
351350

352351
}

0 commit comments

Comments
 (0)