You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2013/10/18 17:55:51 UTC

svn commit: r1533524 - in /syncope/trunk: ./ core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java

Author: fmartelli
Date: Fri Oct 18 15:55:51 2013
New Revision: 1533524

URL: http://svn.apache.org/r1533524
Log:
merged from branch

Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_1_X:r1532233-1533512

Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java?rev=1533524&r1=1533523&r2=1533524&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/data/TaskDataBinder.java Fri Oct 18 15:55:51 2013
@@ -21,6 +21,7 @@ package org.apache.syncope.core.rest.dat
 import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.syncope.common.to.AbstractAttributableTO;
+import org.apache.syncope.common.to.PropagationTaskTO;
 import org.apache.syncope.common.to.AttributeTO;
 import org.apache.syncope.common.to.MembershipTO;
 import org.apache.syncope.common.to.RoleTO;
@@ -253,6 +254,7 @@ public class TaskDataBinder {
                     throw new ClassCastException("taskUtil is type Propagation but task is not PropagationTask: "
                             + task.getClass().getName());
                 }
+                ((PropagationTaskTO) taskTO).setResource(((PropagationTask) task).getResource().getName());
                 break;
 
             case SCHEDULED: