[syncope] branch master updated: [SYNCOPE-1709] Ensure to clean up JobStatus after non-standard Push / Pull JobDelegate classes

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/master by this push:
     new 12bbc5ffb7 [SYNCOPE-1709] Ensure to clean up JobStatus after 
non-standard Push / Pull JobDelegate classes
12bbc5ffb7 is described below

commit 12bbc5ffb755589d2bf11ac9ffd174b56d712a3b
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Tue Nov 29 16:43:49 2022 +0100

    [SYNCOPE-1709] Ensure to clean up JobStatus after non-standard Push / Pull 
JobDelegate classes
---
 .../core/provisioning/java/pushpull/SinglePullJobDelegate.java        | 3 +++
 .../core/provisioning/java/pushpull/SinglePushJobDelegate.java        | 4 ++++
 .../core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java | 2 ++
 .../core/provisioning/java/pushpull/stream/StreamPushJobDelegate.java | 2 ++
 4 files changed, 11 insertions(+)

diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java
index 95a726fb9b..c1d851c240 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePullJobDelegate.java
@@ -89,6 +89,7 @@ public class SinglePullJobDelegate extends PullJobDelegate 
implements SyncopeSin
             task.setSyncStatus(pullTaskTO.isSyncStatus());
             
task.setDestinationRealm(realmDAO.findByFullPath(pullTaskTO.getDestinationRealm()));
             task.setRemediation(pullTaskTO.isRemediation());
+
             // validate JEXL expressions from templates and proceed if fine
             TemplateUtils.check(pullTaskTO.getTemplates(), 
ClientExceptionType.InvalidPullTask);
             pullTaskTO.getTemplates().forEach((type, template) -> {
@@ -169,6 +170,8 @@ public class SinglePullJobDelegate extends PullJobDelegate 
implements SyncopeSin
             throw e instanceof JobExecutionException
                     ? (JobExecutionException) e
                     : new JobExecutionException("While pulling from 
connector", e);
+        } finally {
+            setStatus(null);
         }
     }
 }
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java
index e25434f88e..fae0fd7aec 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/SinglePushJobDelegate.java
@@ -121,6 +121,8 @@ public class SinglePushJobDelegate extends PushJobDelegate 
implements SyncopeSin
             throw e instanceof JobExecutionException
                     ? (JobExecutionException) e
                     : new JobExecutionException("While pushing to connector", 
e);
+        } finally {
+            setStatus(null);
         }
     }
 
@@ -150,6 +152,8 @@ public class SinglePushJobDelegate extends PushJobDelegate 
implements SyncopeSin
             throw e instanceof JobExecutionException
                     ? (JobExecutionException) e
                     : new JobExecutionException("While pushing to connector", 
e);
+        } finally {
+            setStatus(null);
         }
     }
 }
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
index ec9e23d2d6..f6deeda2e9 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
@@ -240,6 +240,8 @@ public class StreamPullJobDelegate extends PullJobDelegate 
implements SyncopeStr
             throw e instanceof JobExecutionException
                     ? (JobExecutionException) e
                     : new JobExecutionException("While stream pulling", e);
+        } finally {
+            setStatus(null);
         }
     }
 }
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPushJobDelegate.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPushJobDelegate.java
index 0ba6965a59..65fa3f8b78 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPushJobDelegate.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPushJobDelegate.java
@@ -179,6 +179,8 @@ public class StreamPushJobDelegate extends PushJobDelegate 
implements SyncopeStr
             throw e instanceof JobExecutionException
                     ? (JobExecutionException) e
                     : new JobExecutionException("While stream pushing", e);
+        } finally {
+            setStatus(null);
         }
     }
 }