File tree Expand file tree Collapse file tree 1 file changed +8
-2
lines changed
Kitodo/src/main/java/org/kitodo/production/forms Expand file tree Collapse file tree 1 file changed +8
-2
lines changed Original file line number Diff line number Diff line change @@ -151,7 +151,7 @@ public Folder getEditingFolder() {
151151 */
152152 public void setEditingFolder (Folder folder ) {
153153 this .editingFolder = folder ;
154- this .originalFileGroup = folder != null ? folder .getFileGroup () : null ;
154+ this .originalFileGroup = Objects . nonNull ( folder ) ? folder .getFileGroup () : null ;
155155 this .generator = new FolderGenerator (folder );
156156 }
157157
@@ -539,7 +539,13 @@ public boolean hasVideoFolder() {
539539 }
540540
541541 private Map <String , Folder > getFolderMap () {
542- return getFolderList ().parallelStream ().collect (Collectors .toMap (Folder ::getFileGroup , Function .identity ()));
542+ return getFolderList ().stream ()
543+ .filter (folder -> StringUtils .isNotBlank (folder .getFileGroup ()))
544+ .collect (Collectors .toMap (
545+ Folder ::getFileGroup ,
546+ Function .identity (),
547+ (existing , replacement ) -> existing
548+ ));
543549 }
544550
545551 /**
You can’t perform that action at this time.
0 commit comments