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:30:32 UTC

svn commit: r1528104 - in /syncope/branches/1_1_X: core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java pom.xml

Author: ilgrosso
Date: Tue Oct  1 14:30:31 2013
New Revision: 1528104

URL: http://svn.apache.org/r1528104
Log:
Upgrade to Wicket 6.11.0

Modified:
    syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
    syncope/branches/1_1_X/pom.xml

Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java?rev=1528104&r1=1528103&r2=1528104&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/workflow/user/activiti/ActivitiUserWorkflowAdapter.java Tue Oct  1 14:30:31 2013
@@ -365,7 +365,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/branches/1_1_X/pom.xml
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/pom.xml?rev=1528104&r1=1528103&r2=1528104&view=diff
==============================================================================
--- syncope/branches/1_1_X/pom.xml (original)
+++ syncope/branches/1_1_X/pom.xml Tue Oct  1 14:30:31 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>