mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Ludovic Poitou
04.09.2011 78ef95c1a79d8027bb8c12ce848f4853153937d1
refs
author Ludovic Poitou <ludovic.poitou@forgerock.com>
Monday, July 4, 2011 22:09 +0200
committer Ludovic Poitou <ludovic.poitou@forgerock.com>
Monday, July 4, 2011 22:09 +0200
commit78ef95c1a79d8027bb8c12ce848f4853153937d1
tree 4beb66144963f42933f21cb5114d500e814925cc tree | zip | gz
parent fd58511a3b70799cf10ca0c61e3c0391bcbbb2aa view | diff
Fix for OPENDJ-223. Modify operation isn't replayed on replica exactly as on original server.
The conflict resolution code didn't consider the case where a single modify operation could contain multiple modifications on an attribute, especially a replace after adds or delete. All changeNumbers would then be equals. Replace always wins over all precedent operations on the attribute, as Modifications are ordered (Sequence of).
2 files modified
90 ■■■■ changed files
opends/src/server/org/opends/server/replication/plugin/AttrHistoricalMultiple.java 6 ●●●● diff | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java 84 ●●●● diff | view | raw | blame | history