mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
parent: 74b6e3 | patch | commitdiff
gbellato
27.52.2007 4497ef71d990f2bdc879b57c08b69f4bf79960bc
refs
author gbellato <gbellato@localhost>
Tuesday, November 27, 2007 08:52 +0100
committer gbellato <gbellato@localhost>
Tuesday, November 27, 2007 08:52 +0100
commit4497ef71d990f2bdc879b57c08b69f4bf79960bc
tree afc906c496dd62e54b7f650ab99b27d6caadd10d tree | zip | gz
parent 74b6e3013b463a413ccf687216465b6f9aac17c4 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
opendj-sdk/opends/src/server/org/opends/server/replication/plugin/ReplicationDomain.java 12 ●●●●● diff | view | raw | blame | history
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/UpdateOperationTest.java 31 ●●●●● diff | view | raw | blame | history