Merge remote-tracking branch 'origin/dmp-refactoring' into email-editor

small fix
2024-10-02 11:44:09 +03:00 · 2024-10-02 10:43:41 +03:00
1 changed files with 2 additions and 2 deletions
--- a/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/PropertyDefinitionFieldSetPersist.java
+++ b/backend/core/src/main/java/org/opencdmp/model/persist/descriptionproperties/PropertyDefinitionFieldSetPersist.java
@ -54,8 +54,8 @@ public class PropertyDefinitionFieldSetPersist {

        @Override
        protected List<Specification> specifications(PropertyDefinitionFieldSetPersist item) {
-            int min = fieldSetEntity != null && fieldSetEntity.getHasMultiplicity() && fieldSetEntity.getMultiplicity() != null ? fieldSetEntity.getMultiplicity().getMin() : 0;
-            int max = fieldSetEntity != null && fieldSetEntity.getHasMultiplicity()  && fieldSetEntity.getMultiplicity() != null ? fieldSetEntity.getMultiplicity().getMax() : Integer.MAX_VALUE;
+            int min = fieldSetEntity != null && fieldSetEntity.getHasMultiplicity() && fieldSetEntity.getMultiplicity() != null && fieldSetEntity.getMultiplicity().getMin() != null ? fieldSetEntity.getMultiplicity().getMin() : 0;
+            int max = fieldSetEntity != null && fieldSetEntity.getHasMultiplicity()  && fieldSetEntity.getMultiplicity() != null && fieldSetEntity.getMultiplicity().getMax() != null ? fieldSetEntity.getMultiplicity().getMax() : Integer.MAX_VALUE;

            return Arrays.asList(
                    this.navSpec()
Author	SHA1	Message	Date
mchouliara	8c42b784ba	Merge remote-tracking branch 'origin/dmp-refactoring' into email-editor	2024-10-02 11:44:09 +03:00
$CITE\amentis$ CITE\amentis	7951f5e50d	small fix	2024-10-02 10:43:41 +03:00