[midPoint-git] [Evolveum/midpoint] a4ee8b: Preliminarily fix delta merging (MID-4690)

[Pavol Mederly]

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: a4ee8b6b04a79679c14cc20abe72af2bd168efa7
      https://github.com/Evolveum/midpoint/commit/a4ee8b6b04a79679c14cc20abe72af2bd168efa7
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java

  Log Message:
  -----------
  Preliminarily fix delta merging (MID-4690)

It looks like the special sub-delta handling code introduced into
ItemDelta.findItemDelta causes problems during object delta merging -
when specific combinations of overlapping modifications are merged.

This partly fixes MID-4593 "First password change sets no metadata".

(This commit is an attempt to fix that; not much tested yet.)


  Commit: 6863b7f8833ae993e7ebfdcbf0681fa123a46f81
      https://github.com/Evolveum/midpoint/commit/6863b7f8833ae993e7ebfdcbf0681fa123a46f81
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-28 (Mon, 28 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialsProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java

  Log Message:
  -----------
  Fix hashing first password (MID-4593)


  Commit: c3123f32daf93e562798d16f87862814598fa86a
      https://github.com/Evolveum/midpoint/commit/c3123f32daf93e562798d16f87862814598fa86a
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2018-05-29 (Tue, 29 May 2018)

  Changed paths:
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ItemDelta.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/delta/ObjectDelta.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestSchemaDelta.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialsProcessor.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java

  Log Message:
  -----------
  Merge branch 'fix/mid-4690'


Compare: https://github.com/Evolveum/midpoint/compare/4ccaa52f6caf...c3123f32daf9
      **NOTE:** This service 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.