Author: tchemit Date: 2013-10-10 15:31:00 +0200 (Thu, 10 Oct 2013) New Revision: 2822 Url: http://nuiton.org/projects/topia/repository/revisions/2822 Log: fixes #2870: Can not replicate association Modified: branches/topia-2.8.1.1/pom.xml branches/topia-2.8.1.1/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java branches/topia-2.8.1.1/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java branches/topia-2.8.1.1/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java Modified: branches/topia-2.8.1.1/pom.xml =================================================================== --- branches/topia-2.8.1.1/pom.xml 2013-10-10 13:09:17 UTC (rev 2821) +++ branches/topia-2.8.1.1/pom.xml 2013-10-10 13:31:00 UTC (rev 2822) @@ -80,13 +80,13 @@ <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.8.1.1 + scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.8.1.2-SNAPSHOT </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.8.1.1 + scm:svn:http://svn.nuiton.org/svn/topia/branches/topia-2.8.1.2-SNAPSHOT </developerConnection> <url> - http://nuiton.org/projects/topia/repository/show/branches/topia-2.8.1.1 + http://nuiton.org/projects/topia/repository/show/branches/topia-2.8.1.2-SNAP... </url> </scm> Modified: branches/topia-2.8.1.1/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- branches/topia-2.8.1.1/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-10-10 13:09:17 UTC (rev 2821) +++ branches/topia-2.8.1.1/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-10-10 13:31:00 UTC (rev 2822) @@ -935,7 +935,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()); Modified: branches/topia-2.8.1.1/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java =================================================================== --- branches/topia-2.8.1.1/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java 2013-10-10 13:09:17 UTC (rev 2821) +++ branches/topia-2.8.1.1/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java 2013-10-10 13:31:00 UTC (rev 2822) @@ -215,7 +215,7 @@ dstTargetEntities == null ? Collections.<String>emptyList() : TopiaEntityHelper.getTopiaIdList( - (List<? extends TopiaEntity>) dstTargetEntities); + (Collection<? extends TopiaEntity>) dstTargetEntities); boolean shouldUpdate = false; for (Object a : targetEntities) { Modified: branches/topia-2.8.1.1/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- branches/topia-2.8.1.1/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2013-10-10 13:09:17 UTC (rev 2821) +++ branches/topia-2.8.1.1/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2013-10-10 13:31:00 UTC (rev 2822) @@ -193,7 +193,7 @@ dstTargetEntities == null ? Collections.<String>emptyList() : TopiaEntityHelper.getTopiaIdList( - (List<? extends TopiaEntity>) dstTargetEntities); + (Collection<? extends TopiaEntity>) dstTargetEntities); boolean shouldUpdate = false; for (Object a : targetEntities) {