You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2013/10/01 16:35:28 UTC
svn commit: r1528107 - in /syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
pom.xml
Author: ilgrosso
Date: Tue Oct 1 14:35:28 2013
New Revision: 1528107
URL: http://svn.apache.org/r1528107
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1528080-1528105
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java?rev=1528107&r1=1528106&r2=1528107&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java Tue Oct 1 14:35:28 2013
@@ -368,7 +368,11 @@ public class ActivitiUserWorkflowAdapter
doExecuteTask(user, "delete", null);
userDAO.delete(user);
- historyService.deleteHistoricProcessInstance(user.getWorkflowId());
+ if (!historyService.createHistoricProcessInstanceQuery().
+ processInstanceId(user.getWorkflowId()).list().isEmpty()) {
+
+ historyService.deleteHistoricProcessInstance(user.getWorkflowId());
+ }
}
@Override
Modified: syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1528107&r1=1528106&r2=1528107&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Tue Oct 1 14:35:28 2013
@@ -324,7 +324,7 @@ under the License.
<cocoon.version>3.0.0-alpha-3</cocoon.version>
- <wicket.version>6.10.0</wicket.version>
+ <wicket.version>6.11.0</wicket.version>
<groovy.version>2.1.6</groovy.version>