mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 38b88d | patch | commitdiff
ludovicp
27.08.2010 3fde23013fcd5ff31f01b580a7e3e23080e5caad
refs
author ludovicp <ludovicp@localhost>
Thursday, May 27, 2010 15:08 +0200
committer ludovicp <ludovicp@localhost>
Thursday, May 27, 2010 15:08 +0200
commit3fde23013fcd5ff31f01b580a7e3e23080e5caad
tree 40f003c05fd1621bd10f994abcdf9f46f90bfba6 tree | zip | gz
parent 38b88d16b004b4fc62125d00c5bc2bd0a504e306 view | diff 
fix issue #4529 - The conflict resolution code was not correctly handling the case when two mods (one add and one del) are done in the same modify operation. This code contains unit tests case for this problem and fix the conflict resolution code.
2 files modified
119 ■■■■■ changed files
opends/src/server/org/opends/server/replication/plugin/AttrInfoMultiple.java 19 ●●●●● diff | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java 100 ●●●●● diff | view | raw | blame | history