[midPoint-git] [Evolveum/midpoint] 6e8d66: fix Conflicting modification in delta exceptions w...

[Pavol Mederly]

  Branch: refs/heads/support-3.9
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6e8d669e912b0395a006b2f4c859fbb0254d08cc
      https://github.com/Evolveum/midpoint/commit/6e8d669e912b0395a006b2f4c859fbb0254d08cc
  Author: Arnost Starosta <arnost.starosta at gmail.com>
  Date:   2018-11-14 (Wed, 14 Nov 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java

  Log Message:
  -----------
  fix Conflicting modification in delta exceptions when delta has no modifications in conflict

(cherry picked from commit d0bec55590fd199cf5af00c3497f1ff3ed5ace77)


  Commit: c15428c9a4d153e5cd57fbadd87eebe809f0328f
      https://github.com/Evolveum/midpoint/commit/c15428c9a4d153e5cd57fbadd87eebe809f0328f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-11-14 (Wed, 14 Nov 2018)

  Changed paths:
    M infra/prism/src/test/java/com/evolveum/midpoint/prism/TestDelta.java

  Log Message:
  -----------
  Re-enable a test in TestDelta after Arnost's fix

TestDelta.testObjectDeltaFindItemDeltaModifyNonExistentPropertyInReplacedContainer
was failing because of a fault that Arnost has recently fixed. So this
test can be re-enabled now. Related to MID-4689.

(cherry picked from commit cecfc19c6411db3321b8285594cf272be02ab220)


  Commit: 91dfdc6bbe0c29e42a72660fedf3555ee8cbf9c9
      https://github.com/Evolveum/midpoint/commit/91dfdc6bbe0c29e42a72660fedf3555ee8cbf9c9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-11-14 (Wed, 14 Nov 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ContainerDelta.java

  Log Message:
  -----------
  Fix a minor fault in findItemValues

Replaced "==" with .equals() when comparing Long objects.

(cherry picked from commit d1e33acc5317a4dee211bd46cc64cb59101fdc73)


Compare: https://github.com/Evolveum/midpoint/compare/455fbdb1744a...91dfdc6bbe0c
      **NOTE:** This service has been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.