Author: mfortun Date: 2011-04-21 15:07:49 +0200 (Thu, 21 Apr 2011) New Revision: 829 Url: http://nuiton.org/repositories/revision/wikitty/829 Log: * correction to ensure version are the same on both wikittyservice after udapte, and existing type of sync. Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-21 12:22:24 UTC (rev 828) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-21 13:07:49 UTC (rev 829) @@ -68,7 +68,6 @@ static protected ApplicationConfig applicationConfig; - /** * for recursion option */ @@ -199,6 +198,8 @@ List<Wikitty> newWikitties = proxyOrigin.restore(existOnlyOnOrigin); proxyTarget.storeWikitty(newWikitties); + // we re store on the origin to ensure wikitty version + proxyOrigin.storeWikitty(newWikitties); } /* @@ -211,6 +212,7 @@ WikittyLabelHelper.removeLabels(w, labelTarget); proxyTarget.store(w); + } } else { /* @@ -238,6 +240,8 @@ WikittyLabelHelper.setLabels(fromOrigin, setLabelTarget); // send modified origin to target wikitty service proxyTarget.store(fromOrigin); + // re store on origin to ensure version is the same on both + proxyOrigin.store(fromOrigin); } }