Skip to content

Commit 2db1105

Browse files
committed
fix for failing tests
1 parent 2c765a9 commit 2db1105

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/main/java/com/redhat/labs/lodestar/service/EngagementService.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,10 @@ private List<File> createUserManagementFiles(Engagement engagement) {
262262

263263
List<File> userResetFiles = new ArrayList<>();
264264

265+
if (null == engagement.getEngagementUsers()) {
266+
return userResetFiles;
267+
}
268+
265269
// get all users that requested a reset
266270
List<EngagementUser> users = engagement.getEngagementUsers().stream().filter(user -> user.isReset())
267271
.collect(Collectors.toList());
@@ -320,7 +324,8 @@ private CommitMultiple createCommitMultiple(List<File> filesToCommit, Integer pr
320324
.collect(Collectors.toList());
321325

322326
// merge the actions
323-
List<Action> actions = Stream.of(userManagementFiles, otherFiles).flatMap(x -> x.stream()).collect(Collectors.toList());
327+
List<Action> actions = Stream.of(userManagementFiles, otherFiles).flatMap(x -> x.stream())
328+
.collect(Collectors.toList());
324329

325330
// use message if provided. otherwise, defaults
326331
String commitMessage = commitMessageOptional

0 commit comments

Comments
 (0)