Merge branch 'hotfix' into 'master'
hotfix: fix mapping query error See merge request redactmanager/redaction-service!435
This commit is contained in:
commit
f8cfc4bd1a
@ -76,7 +76,7 @@ public class ComponentMapping implements Queryable {
|
|||||||
|
|
||||||
// find all elements which fulfill query
|
// find all elements which fulfill query
|
||||||
List<String[]> result = new LinkedList<>();
|
List<String[]> result = new LinkedList<>();
|
||||||
while (data.get(idx)[0].equals(queryParameters.query())) {
|
while (idx < data.size() && data.get(idx)[0].equals(queryParameters.query())) {
|
||||||
result.add(data.get(idx));
|
result.add(data.get(idx));
|
||||||
idx++;
|
idx++;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -124,7 +124,7 @@ public class ComponentDroolsExecutionService {
|
|||||||
private static void addOrUpdate(Set<FileAttribute> fileAttributes, List<FileAttribute> resultingFileAttributes) {
|
private static void addOrUpdate(Set<FileAttribute> fileAttributes, List<FileAttribute> resultingFileAttributes) {
|
||||||
|
|
||||||
for (FileAttribute resultingFileAttribute : resultingFileAttributes) {
|
for (FileAttribute resultingFileAttribute : resultingFileAttributes) {
|
||||||
fileAttributes.remove(resultingFileAttribute);
|
fileAttributes.removeIf(fa -> fa.getLabel().equals(resultingFileAttribute.getLabel()));
|
||||||
fileAttributes.add(resultingFileAttribute);
|
fileAttributes.add(resultingFileAttribute);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user