mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 03889a | patch | commitdiff
gbellato
27.52.2007 82d096b83ec89684d8a815bc3b1870c1a0157bfe
refs
author gbellato <gbellato@localhost>
Tuesday, November 27, 2007 08:52 +0100
committer gbellato <gbellato@localhost>
Tuesday, November 27, 2007 08:52 +0100
commit82d096b83ec89684d8a815bc3b1870c1a0157bfe
tree 45683cab33c0c6b1b0ec3bb55a4678d7ba3756c9 tree | zip | gz
parent 03889aa19bbeb860d9e460df2a2023df366da89d view | diff 
Fix for 2565 Java Exception during conflict resolution
 
In this particular case of conflict resolution, the newSuperior was null
and this was causing some Exception.
The solution is simply to test for this condition and generate a conflict. 
Also added a unit test for this particular case.
2 files modified
43 ■■■■■ changed files
opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java 12 ●●●●● diff | view | raw | blame | history
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java 31 ●●●●● diff | view | raw | blame | history