Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Apr 7, 2020 · d9da13d · d9da13d
2 parents 2365411 + b3d54ac
commit d9da13d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
@@ -822,7 +822,7 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res
                         if (checkValidationErrors(target, validationErrors)) {
                             return;
                         }
-                        if (isSaveInBackground()){
+                        if (isSaveInBackground() && !previewOnly){
                             progressPanel.executeChangesInBackground(deltas, previewOnly, options, task, result, target);
                         } else {
                             progressPanel.executeChanges(deltas, previewOnly, options, task, result, target);
@@ -871,7 +871,7 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res
                         if (checkValidationErrors(target, validationErrors)) {
                             return;
                         }
-                        if (isSaveInBackground()){
+                        if (isSaveInBackground() && !previewOnly){
                             progressPanel.executeChangesInBackground(deltas, previewOnly, options, task, result, target);
                         } else {
                             progressPanel.executeChanges(deltas, previewOnly, options, task, result, target);
@@ -881,13 +881,13 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res
                         if (checkValidationErrors(target, validationErrors)) {
                             return;
                         }
-                        if (isSaveInBackground()){
+                        if (isSaveInBackground() && !previewOnly){
                             progressPanel.executeChangesInBackground(deltas, previewOnly, options, task, result, target);
                         } else {
                             progressPanel.executeChanges(deltas, previewOnly, options, task, result, target);
                         }
                     } else if (previewOnly && delta.isEmpty() && delegationChangesExist){
-                        if (isSaveInBackground()){
+                        if (isSaveInBackground() && !previewOnly){
                             progressPanel.executeChangesInBackground(deltas, previewOnly, options, task, result, target);
                         } else {
                             progressPanel.executeChanges(deltas, previewOnly, options, task, result, target);

diff --git a/.../src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java b/.../src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/MailTransport.java
@@ -326,6 +326,7 @@ public String getContentType() {
                 long duration = System.currentTimeMillis() - start;
                 task.recordState("Notification mail sent successfully via " + host + ", in " + duration + " ms overall.");
                 task.recordNotificationOperation(NAME, true, duration);
+                t.close();
                 return;
             } catch (MessagingException e) {
                 String msg = "Couldn't send mail message to " + mailMessage.getTo() + " via " + host + ", trying another mail server, if there is any";