Merge branch 'backport-4052' into release-1.6.x

eclipse-kapua · Jun 7, 2024 · 5f8a0d5 · 5f8a0d5
2 parents e3f697d + 8ad6d95
commit 5f8a0d5
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/...nternal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepServiceImpl.java b/...nternal/src/main/java/org/eclipse/kapua/service/job/step/internal/JobStepServiceImpl.java
@@ -391,10 +391,13 @@ private void validateJobStepProperties(List<JobStepProperty> jobStepProperties,
                         ArgumentValidator.notNull(jobStepProperty.getPropertyValue(), "stepProperties[]." + jobStepProperty.getName());
                     }
 
-                    ArgumentValidator.areEqual(jobStepProperty.getPropertyType(), jobStepDefinitionProperty.getPropertyType(), "stepProperties[]." + jobStepProperty.getName());
-                    ArgumentValidator.lengthRange(jobStepProperty.getPropertyValue(), jobStepDefinitionProperty.getMinLength(), jobStepDefinitionProperty.getMaxLength(), "stepProperties[]." + jobStepProperty.getName());
+                    if (jobStepProperty.getPropertyValue() != null) {
+                        ArgumentValidator.areEqual(jobStepProperty.getPropertyType(), jobStepDefinitionProperty.getPropertyType(), "stepProperties[]." + jobStepProperty.getName());
+                        ArgumentValidator.lengthRange(jobStepProperty.getPropertyValue(), jobStepDefinitionProperty.getMinLength(), jobStepDefinitionProperty.getMaxLength(),
+                                                      "stepProperties[]." + jobStepProperty.getName());
 
-                    validateJobStepPropertyValue(jobStepProperty, jobStepDefinitionProperty);
+                        validateJobStepPropertyValue(jobStepProperty, jobStepDefinitionProperty);
+                    }
                 }
             }
         }