Fix value validations when updating locked phases

(refs #1108) Change-Id: I14aa120375e67b10d81b84ec3ef171dd284f6645
sigmah-dev · Jan 30, 2018 · 884b660 · 884b660
1 parent f5b3c72
commit 884b660
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/main/java/org/sigmah/server/handler/UpdateProjectHandler.java b/src/main/java/org/sigmah/server/handler/UpdateProjectHandler.java
@@ -340,8 +340,20 @@ private List<String> searchForConflicts(final Project project, final List<ValueE
 
 				if (projectIsClosed || phaseIsClosed || (source.getAmendable() && projectIsLocked)) {
 					final ValueResult result = new ValueResult();
-					result.setValueObject(value.getSingleValue());
-					result.setValuesObject(value.getTripletValue() != null ? Collections.<ListableValue>singletonList(value.getTripletValue()) : null);
+
+					final String updateSingleValue = value.getSingleValue();
+					final TripletValueDTO updateListValue = value.getTripletValue();
+					final Set<Integer> multivaluedIdsValue = value.getMultivaluedIdsValue();
+
+					if (updateSingleValue != null) {
+						result.setValueObject(updateSingleValue);
+					} else if (updateListValue != null) {
+						result.setValuesObject(Collections.<ListableValue>singletonList(value.getTripletValue()));
+					} else if (multivaluedIdsValue != null) {
+						result.setValueObject(ValueResultUtils.mergeElements(new ArrayList<Integer>(multivaluedIdsValue)));
+					} else {
+						LOGGER.warn("Empty value event received for element #{} ({}) of container #{}.", source.getId(), source.getEntityName(), project.getId());
+					}
 
 					if(!source.isCorrectRequiredValue(result)) {
 						conflicts.add(i18nServer.t(language, "conflictModifyLockedContentEmptyValue",