Author: tchemit Date: 2013-10-10 15:40:13 +0200 (Thu, 10 Oct 2013) New Revision: 2824 Url: http://nuiton.org/projects/topia/repository/revisions/2824 Log: can not replicate association when they are not a list Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-10-10 13:39:46 UTC (rev 2823) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-10-10 13:40:13 UTC (rev 2824) @@ -914,7 +914,7 @@ * @return la liste des topiaId */ public static List<String> getTopiaIdList( - List<? extends TopiaEntity> entities) { + Collection<? extends TopiaEntity> entities) { List<String> ids = new ArrayList<String>(entities.size()); for (TopiaEntity entity : entities) { ids.add(entity.getTopiaId()); @@ -930,7 +930,7 @@ * @since 2.5.2 */ public static String[] getTopiaIdArray( - List<? extends TopiaEntity> entities) { + Collection<? extends TopiaEntity> entities) { String[] ids = new String[entities.size()]; int i = 0; for (TopiaEntity entity : entities) { @@ -949,7 +949,7 @@ * @return la nouvelle liste filtree */ public static <E extends TopiaEntity> List<E> retainEntities( - List<E> list, List<String> topiaIds) { + Collection<E> list, List<String> topiaIds) { List<E> r = new ArrayList<E>(list == null ? 0 : list.size()); if (list != null) { Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2013-10-10 13:39:46 UTC (rev 2823) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2013-10-10 13:40:13 UTC (rev 2824) @@ -190,7 +190,7 @@ dstTargetEntities == null ? Collections.<String>emptyList() : TopiaEntityHelper.getTopiaIdList( - (List<? extends TopiaEntity>) dstTargetEntities); + (Collection<? extends TopiaEntity>) dstTargetEntities); boolean shouldUpdate = false; for (Object a : targetEntities) {