mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 065edf | patch | commitdiff
ludovicp
27.08.2010 9bce02d6f4ad4d8522bac50f5c603efbb57b0d7e
refs
author ludovicp <ludovicp@localhost>
Thursday, May 27, 2010 15:08 +0200
committer ludovicp <ludovicp@localhost>
Thursday, May 27, 2010 15:08 +0200
commit9bce02d6f4ad4d8522bac50f5c603efbb57b0d7e
tree 34fdeccc908063d41d673f35ebdeac6e37fccbf1 tree | zip | gz
parent 065edf026f075037c2f1f26da594742def064cb4 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
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/AttrInfoMultiple.java 19 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/ModifyConflictTest.java 100 ●●●●● diff | view | raw | blame | history