Fixed "Neither value nor raw element specified in property value PPV(…

…null) (expectedTotal in ...)" exception in ReconciliationTaskHandler.
Evolveum · Sep 23, 2015 · 3ecd06a · 3ecd06a
1 parent 5304d02
commit 3ecd06a
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/.../task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java b/.../task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
@@ -419,7 +419,7 @@ public void setProgressTransient(long value) {
 
 	private PropertyDelta<?> setProgressAndPrepareDelta(long value) {
 		setProgressTransient(value);
-		return isPersistent() ? PropertyDelta.createReplaceDelta(
+		return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
 				taskManager.getTaskObjectDefinition(), TaskType.F_PROGRESS, value) : null;
 	}
 
@@ -455,7 +455,7 @@ public void setExpectedTotalTransient(Long value) {
 
     private PropertyDelta<?> setExpectedTotalAndPrepareDelta(Long value) {
         setExpectedTotalTransient(value);
-        return isPersistent() ? PropertyDelta.createReplaceDelta(
+        return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
                 taskManager.getTaskObjectDefinition(), TaskType.F_EXPECTED_TOTAL, value) : null;
     }
 
@@ -627,7 +627,7 @@ public void setOtherHandlersUriStack(UriStack value) {
 
 	private PropertyDelta<?> setOtherHandlersUriStackAndPrepareDelta(UriStack value) {
 		setOtherHandlersUriStackTransient(value);
-		return isPersistent() ? PropertyDelta.createReplaceDelta(
+		return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
 					taskManager.getTaskObjectDefinition(), TaskType.F_OTHER_HANDLERS_URI_STACK, value) : null;
 	}
 
@@ -991,7 +991,7 @@ public void setExecutionStatus(TaskExecutionStatus value) {
 
     private PropertyDelta<?> setExecutionStatusAndPrepareDelta(TaskExecutionStatus value) {
 		setExecutionStatusTransient(value);
-		return isPersistent() ? PropertyDelta.createReplaceDelta(
+		return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
 					taskManager.getTaskObjectDefinition(), TaskType.F_EXECUTION_STATUS, value.toTaskType()) : null;
 	}
 
@@ -1059,7 +1059,7 @@ public void setWaitingReasonImmediate(TaskWaitingReason value, OperationResult p
 
     private PropertyDelta<?> setWaitingReasonAndPrepareDelta(TaskWaitingReason value) {
         setWaitingReasonTransient(value);
-        return isPersistent() ? PropertyDelta.createReplaceDelta(
+        return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
                 taskManager.getTaskObjectDefinition(), TaskType.F_WAITING_REASON, value.toTaskType()) : null;
     }
 
@@ -1120,7 +1120,7 @@ public void setRecurrenceStatusTransient(TaskRecurrence value) {
 
 	private PropertyDelta<?> setRecurrenceStatusAndPrepareDelta(TaskRecurrence value) {
 		setRecurrenceStatusTransient(value);
-		return isPersistent() ? PropertyDelta.createReplaceDelta(
+		return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
 					taskManager.getTaskObjectDefinition(), TaskType.F_RECURRENCE, value.toTaskType()) : null;
 	}
 
@@ -1286,7 +1286,7 @@ public void setBindingTransient(TaskBinding value) {
 
 	private PropertyDelta<?> setBindingAndPrepareDelta(TaskBinding value) {
 		setBindingTransient(value);
-		return isPersistent() ? PropertyDelta.createReplaceDelta(
+		return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
 					taskManager.getTaskObjectDefinition(), TaskType.F_BINDING, value.toTaskType()) : null;
 	}
 
@@ -1360,7 +1360,7 @@ public void setChannelTransient(String name) {
 
     private PropertyDelta<?> setChannelAndPrepareDelta(String value) {
         setChannelTransient(value);
-        return isPersistent() ? PropertyDelta.createReplaceDelta(
+        return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
                 taskManager.getTaskObjectDefinition(), TaskType.F_CHANNEL, value) : null;
     }
 
@@ -1540,7 +1540,7 @@ public void setNameTransient(PolyStringType name) {
 
 	private PropertyDelta<?> setNameAndPrepareDelta(PolyStringType value) {
 		setNameTransient(value);
-		return isPersistent() ? PropertyDelta.createReplaceDelta(
+		return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
 					taskManager.getTaskObjectDefinition(), TaskType.F_NAME, value.toPolyString()) : null;
 	}
 
@@ -1574,7 +1574,7 @@ public void setDescriptionTransient(String name) {
 
     private PropertyDelta<?> setDescriptionAndPrepareDelta(String value) {
         setDescriptionTransient(value);
-        return isPersistent() ? PropertyDelta.createReplaceDelta(
+        return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
                 taskManager.getTaskObjectDefinition(), TaskType.F_DESCRIPTION, value) : null;
     }
 
@@ -1616,7 +1616,7 @@ public void setParentTransient(String name) {
 
     private PropertyDelta<?> setParentAndPrepareDelta(String value) {
         setParentTransient(value);
-        return isPersistent() ? PropertyDelta.createReplaceDelta(
+        return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
                 taskManager.getTaskObjectDefinition(), TaskType.F_PARENT, value) : null;
     }
 
@@ -1976,13 +1976,8 @@ public void setNodeTransient(String value) {
 
     private PropertyDelta<?> setNodeAndPrepareDelta(String value) {
         setNodeTransient(value);
-        if (value != null) {
-	        return isPersistent() ? PropertyDelta.createReplaceDelta(
-	                taskManager.getTaskObjectDefinition(), TaskType.F_NODE, value) : null;
-        } else {
-        	return isPersistent() ? PropertyDelta.createReplaceDelta(
-	                taskManager.getTaskObjectDefinition(), TaskType.F_NODE) : null;
-        }
+		return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
+				taskManager.getTaskObjectDefinition(), TaskType.F_NODE, value) : null;
     }
 
 
@@ -2165,7 +2160,7 @@ public void setCategoryTransient(String value) {
 
     private PropertyDelta<?> setCategoryAndPrepareDelta(String value) {
         setCategoryTransient(value);
-        return isPersistent() ? PropertyDelta.createReplaceDelta(
+        return isPersistent() ? PropertyDelta.createReplaceDeltaOrEmptyDelta(
                 taskManager.getTaskObjectDefinition(), TaskType.F_CATEGORY, value) : null;
     }