test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-12-03 20:38:52 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

!197 针对I8NT4S 的issue修复bug

Browse Source 
Merge pull request !197 from 周冰/dev_zhoubing
This commit is contained in:
蒋小小 2023-12-15 09:57:09 +00:00 committed by Gitee
commit 4f86b30a6f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/common/src/main/java/org/dromara/jpom/util/CommandUtil.java
View File

@ -361,7 +361,9 @@ public class CommandUtil {
processBuilder.redirectErrorStream(true);
processBuilder.command(command);
Optional.ofNullable(baseDir).ifPresent(processBuilder::directory);
// 新增逻辑,将env和environment里value==null替换成空字符,防止putAll出现空指针报错
env.replaceAll((k,v)-> Optional.ofNullable(v).orElse(StrUtil.EMPTY));
environment.replaceAll((k,v)-> Optional.ofNullable(v).orElse(StrUtil.EMPTY));
Map<String, String> environment = processBuilder.environment();
// 环境变量
Optional.ofNullable(env).ifPresent(environment::putAll);