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/09/20 10:26:38 UTC
svn commit: r1524938 - in /syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
Author: ilgrosso
Date: Fri Sep 20 08:26:37 2013
New Revision: 1524938
URL: http://svn.apache.org/r1524938
Log:
[SYNCOPE-417] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1524734-1524937
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java?rev=1524938&r1=1524937&r2=1524938&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/workflow/user/NoOpUserWorkflowAdapter.java Fri Sep 20 08:26:37 2013
@@ -115,7 +115,7 @@ public class NoOpUserWorkflowAdapter ext
SyncopeUser updated = userDAO.save(user);
return new WorkflowResult<Map.Entry<Long, Boolean>>(
- new AbstractMap.SimpleEntry<Long, Boolean>(updated.getId(), true), propByRes, "update");
+ new AbstractMap.SimpleEntry<Long, Boolean>(updated.getId(), !user.isSuspended()), propByRes, "update");
}
@Override