Merge remote-tracking branch 'origin/master'

Evolveum · Apr 20, 2018 · 0148d82 · 0148d82
2 parents dc7561b + 1079c46
commit 0148d82
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
@@ -429,6 +429,8 @@ public UserType run() {
 	private OperationResult saveUserNonce(final UserType user, final NonceCredentialsPolicyType noncePolicy) {
 		return runPrivileged(new Producer<OperationResult>() {
 
+			private static final long serialVersionUID = 1L;
+
 			@Override
 			public OperationResult run() {
 				Task task = createAnonymousTask("generateUserNonce");
@@ -440,13 +442,11 @@ public OperationResult run() {
 					nonceCredentials
 							.setClearValue(generateNonce(noncePolicy, task, user.asPrismObject(), result));
 
-					NonceType nonceType = new NonceType();
-					nonceType.setValue(nonceCredentials);
-
-					ObjectDelta<UserType> nonceDelta;
+//					NonceType nonceType = new NonceType();
+//					nonceType.setValue(nonceCredentials);
 
-					nonceDelta = ObjectDelta.createModificationReplaceContainer(UserType.class, user.getOid(),
-							SchemaConstants.PATH_NONCE, getPrismContext(), nonceType);
+					ObjectDelta<UserType> nonceDelta = ObjectDelta.createModificationReplaceProperty(UserType.class, user.getOid(),
+							SchemaConstants.PATH_NONCE_VALUE, getPrismContext(), nonceCredentials);
 
 					WebModelServiceUtils.save(nonceDelta, result, task, PageForgotPassword.this);
 				} catch (SchemaException | ExpressionEvaluationException | ObjectNotFoundException | CommunicationException | ConfigurationException | SecurityViolationException e) {