Fixing some prismContext-related NPEs.

Evolveum · Oct 16, 2014 · af522e2 · af522e2
1 parent a52341d
commit af522e2
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
@@ -1360,6 +1360,7 @@ private void savePerformed(AjaxRequestTarget target) {
                     }
 
                     if (!delta.isEmpty()) {
+                        delta.revive(getPrismContext());
                         progressReporter.executeChanges(WebMiscUtil.createDeltaCollection(delta), options, task, result, target);
                     } else {
                         result.recordSuccess();
@@ -1383,11 +1384,13 @@ private void savePerformed(AjaxRequestTarget target) {
                     Collection<ObjectDelta<? extends ObjectType>> deltas = new ArrayList<ObjectDelta<? extends ObjectType>>();
 
                     if (!delta.isEmpty()) {
+                        delta.revive(getPrismContext());
                         deltas.add(delta);
                     }
                     for (ObjectDelta accDelta : accountDeltas) {
                         if (!accDelta.isEmpty()) {
-                            accDelta.setPrismContext(getPrismContext());
+                            //accDelta.setPrismContext(getPrismContext());
+                            accDelta.revive(getPrismContext());
                             deltas.add(accDelta);
                         }
                     }
@@ -1504,7 +1507,7 @@ private boolean executeForceDelete(ObjectWrapper userWrapper, Task task, ModelEx
             // }
             try {
                 ObjectDelta<UserType> forceDeleteDelta = getChange(userWrapper);
-                forceDeleteDelta.setPrismContext(getPrismContext());
+                forceDeleteDelta.revive(getPrismContext());
 
                 if (forceDeleteDelta != null && !forceDeleteDelta.isEmpty()) {
                     getModelService().executeChanges(WebMiscUtil.createDeltaCollection(forceDeleteDelta), options,