Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.6] Backport fixes from master #6027

Merged
merged 3 commits into from
Apr 11, 2024
Merged

[3.6] Backport fixes from master #6027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
138263a
Fix CID 415251 (Dereference before null check)
stweil Mar 7, 2024
242402e
Fix CID 415245 (Useless call)
stweil Mar 7, 2024
0c7969b
Fix NullPointerException
matthias-ronge Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Kitodo/src/main/java/org/kitodo/production/forms/dataeditor/DataEditorForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ public List<Pair<PhysicalDivision, LogicalDivision>> getSelectedMedia() {
* <p>Note: This method is called potentially thousands of times when rendering large galleries.</p>
*/
public boolean consecutivePagesSelected() {
if (selectedMedia.isEmpty()) {
if (Objects.isNull(selectedMedia) || selectedMedia.isEmpty()) {
return false;
}
int maxOrder = selectedMedia.stream().mapToInt(m -> m.getLeft().getOrder()).max().orElseThrow(NoSuchElementException::new);
Expand Down
2 changes: 1 addition & 1 deletion Kitodo/src/main/java/org/kitodo/production/metadata/MetadataEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private static void addMultipleStructuresWithMetadataGroup(int number, String ty
for (int i = 0; i < number; i++) {
LogicalDivision newStructure = addLogicalDivision(type, workpiece, structure, position,
Collections.emptyList());
if (Objects.isNull(newStructure) || metadataKey.isEmpty() || metadataKey == null) {
if (Objects.isNull(newStructure) || metadataKey == null || metadataKey.isEmpty()) {
continue;
}
MetadataGroup metadataGroup = new MetadataGroup();
Expand Down
6 changes: 3 additions & 3 deletions Kitodo/src/main/java/org/kitodo/production/services/data/FilterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,9 +261,9 @@ private QueryBuilder buildQueryFromCondition(String condition, ObjectType object
}

private String replaceLegacyFilters(String filter) {
filter.replace("processproperty","property");
filter.replace("workpiece","property");
filter.replace("template","property");
filter = filter.replace("processproperty","property");
filter = filter.replace("workpiece","property");
filter = filter.replace("template","property");
return filter;
}

Expand Down
Loading