mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 00f5ee | patch | commitdiff
gbellato
19.05.2007 8082c686a8bb865354514b24ec567ba0466ce4bc
refs
author gbellato <gbellato@localhost>
Monday, March 19, 2007 09:05 +0100
committer gbellato <gbellato@localhost>
Monday, March 19, 2007 09:05 +0100
commit8082c686a8bb865354514b24ec567ba0466ce4bc
tree d790eaf04b6ea2fdb31ef5fb08164623a5ba8bca tree | zip | gz
parent 00f5eee9ce02ed3e3d0b3c1f2658951b8f37acef view | diff 
Fix for issue 1375 : Conflict between add and replace can be incorrectly resolved
The problem happens because the historical information saved in the entry is badly
read in the Historical.load() method

This change add some tests for this case and also fix the Historical.load() method.
3 files modified
112 ■■■■■ changed files
opends/src/server/org/opends/server/synchronization/plugin/AttrInfo.java 21 ●●●●● diff | view | raw | blame | history
opends/src/server/org/opends/server/synchronization/plugin/SynchronizationDomain.java 3 ●●●●● diff | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/synchronization/plugin/ModifyConflictTest.java 88 ●●●●● diff | view | raw | blame | history