Fixed another "prism context is null" exception; this time manifestin…

…g in shopping cart.
Evolveum · Jul 6, 2017 · 6e45156 · 6e45156
1 parent 5284ce0
commit 6e45156
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java b/...gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
@@ -553,6 +553,7 @@ public PrismContainerValue<AssignmentType> getOldValue() {
 	}
 
 	public PrismContainerValue<AssignmentType> getNewValue(PrismContext prismContext) throws SchemaException {
+		prismContext.adopt(newAssignment);
 		// this removes activation element if it's empty
 		ActivationType activation = newAssignment.getActivation();
 		if (activation == null || activation.asPrismContainerValue().isEmpty()) {

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceValue.java
@@ -698,4 +698,13 @@ public Referencable getRealValue() {
 	public static boolean containsOid(Collection<PrismReferenceValue> values, @NotNull String oid) {
 		return values.stream().anyMatch(v -> oid.equals(v.getOid()));
 	}
+
+	@Override
+	public void revive(PrismContext prismContext) throws SchemaException {
+		super.revive(prismContext);
+		if (object != null) {
+			object.revive(prismContext);
+		}
+	}
+
 }
diff --git a/...uartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java b/...uartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskManagerQuartzImpl.java
@@ -1921,7 +1921,7 @@ private List<Task> listWaitingTasks(TaskWaitingReason reason, OperationResult re
     // returns map task lightweight id -> task
     public Map<String,TaskQuartzImpl> getLocallyRunningTaskInstances() {
         synchronized (locallyRunningTaskInstancesMap) {    // must be synchronized while iterating over it (addAll)
-            return new HashMap<String,TaskQuartzImpl>(locallyRunningTaskInstancesMap);
+            return new HashMap<>(locallyRunningTaskInstancesMap);
         }
     }