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

[Pavol Mederly]

  Branch: refs/heads/support-3.8
  Home:   https://github.com/Evolveum/midpoint
  Commit: b3458cf46676d19f5ad40e53a484b5d78bde778a
      https://github.com/Evolveum/midpoint/commit/b3458cf46676d19f5ad40e53a484b5d78bde778a
  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: 682d04a50bfff4e9b322af1d47704f4c95b6f11a
      https://github.com/Evolveum/midpoint/commit/682d04a50bfff4e9b322af1d47704f4c95b6f11a
  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: 6bd62473f94e639fb21fd9b90ef764efc542d482
      https://github.com/Evolveum/midpoint/commit/6bd62473f94e639fb21fd9b90ef764efc542d482
  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)


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

  Changed paths:
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/support-3.8' into support-3.8


Compare: https://github.com/Evolveum/midpoint/compare/21e45217bc3c...2c2f6609d1c7
      **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.