[midPoint-git] [Evolveum/midpoint] 338521: Fix NPE in ShadowUtil.matches method

virgo47 noreply at github.com
Wed Oct 28 08:09:56 CET 2020


  Branch: refs/heads/feature/repo-test
  Home:   https://github.com/Evolveum/midpoint
  Commit: 33852194aa6dc5bac0b448d47c391b100593f6b1
      https://github.com/Evolveum/midpoint/commit/33852194aa6dc5bac0b448d47c391b100593f6b1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java

  Log Message:
  -----------
  Fix NPE in ShadowUtil.matches method

This resolves MID-6673.


  Commit: 5026b2b01b77874a37df4e77d5703cb725d898ef
      https://github.com/Evolveum/midpoint/commit/5026b2b01b77874a37df4e77d5703cb725d898ef
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java
    M pom.xml
    M provisioning/ucf-impl-connid/src/test/resources/connector-ldap.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: 6ea434580fb195cec8fe65a45e9cb86fe62ed577
      https://github.com/Evolveum/midpoint/commit/6ea434580fb195cec8fe65a45e9cb86fe62ed577
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2020-10-23 (Fri, 23 Oct 2020)

  Changed paths:
    M config/initial-objects/000-system-configuration.xml
    M config/initial-objects/030-role-superuser.xml
    M config/initial-objects/040-role-enduser.xml
    M config/initial-objects/041-role-approver.xml
    M config/initial-objects/042-role-reviewer.xml
    M config/initial-objects/043-role-delegator.xml
    M config/initial-objects/050-user-administrator.xml
    A config/initial-objects/060-archetype-report-dashboard.xml
    A config/initial-objects/061-archetype-report-collection.xml
    A config/initial-objects/080-report-audit.xml
    A config/initial-objects/090-report-audit-jasper.xml
    R config/initial-objects/090-report-audit.xml
    M config/initial-objects/100-report-reconciliation.xml
    M config/initial-objects/110-report-user-list.xml
    M config/initial-objects/130-report-certification-definitions.xml
    M config/initial-objects/140-report-certification-campaigns.xml
    M config/initial-objects/150-report-certification-cases.xml
    M config/initial-objects/160-report-certification-decisions.xml
    M config/initial-objects/200-lookup-languages.xml
    M config/initial-objects/210-lookup-locales.xml
    A config/initial-objects/255-object-collection-certification-definition-all.xml
    M config/initial-objects/260-object-collection-task-all.xml
    M config/initial-objects/270-object-collection-task-active.xml
    A config/initial-objects/284-object-collection-audit.xml
    A config/initial-objects/285-object-collection-audit-24h.xml
    A config/initial-objects/290-object-collection-audit-errors-24h.xml
    R config/initial-objects/290-object-collection-audit-errors.xml
    A config/initial-objects/300-object-collection-audit-modifications-24h.xml
    R config/initial-objects/300-object-collection-audit-modifications.xml
    M config/initial-objects/310-dashboard-admin.xml
    M config/initial-objects/504-archetype-task-live-sync.xml
    M config/initial-objects/507-archetype-task-report.xml
    A config/initial-objects/600-origin-internal.xml

  Log Message:
  -----------
  Initial objects


  Commit: ebf10da37eccae6d17d20ac7fec6c18f2f408836
      https://github.com/Evolveum/midpoint/commit/ebf10da37eccae6d17d20ac7fec6c18f2f408836
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2020-10-23 (Fri, 23 Oct 2020)

  Changed paths:
    M NEWS
    M README
    M README.md
    M RELEASE-NOTES
    M custom/pom.xml
    M dist/javadoc/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui/pom.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/axiom/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-api/pom.xml
    M infra/prism-impl/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/schema-pure-jaxb/pom.xml
    M infra/schema/pom.xml
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M model/certification-api/pom.xml
    M model/certification-impl/pom.xml
    M model/model-api/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    M model/model-intest/pom.xml
    M model/model-test/pom.xml
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/rest-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/ucf-api/pom.xml
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-connid/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-common/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/security-api/pom.xml
    M repo/security-enforcer-api/pom.xml
    M repo/security-enforcer-impl/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M testing/conntest/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/schrodingertest/pom.xml
    M testing/story/pom.xml
    M tools/midpoint-war-layout/pom.xml
    M tools/ninja/pom.xml
    M tools/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/schrodinger/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml

  Log Message:
  -----------
  Version 4.2 (Maxwell)


  Commit: 623d40931dde1874a09929400a42ae50e85edde8
      https://github.com/Evolveum/midpoint/commit/623d40931dde1874a09929400a42ae50e85edde8
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2020-10-23 (Fri, 23 Oct 2020)

  Changed paths:
    M README
    M README.md
    M custom/pom.xml
    M dist/javadoc/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui/pom.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/axiom/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-api/pom.xml
    M infra/prism-impl/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/schema-pure-jaxb/pom.xml
    M infra/schema/pom.xml
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M model/certification-api/pom.xml
    M model/certification-impl/pom.xml
    M model/model-api/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    M model/model-intest/pom.xml
    M model/model-test/pom.xml
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/rest-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/ucf-api/pom.xml
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-connid/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-common/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/security-api/pom.xml
    M repo/security-enforcer-api/pom.xml
    M repo/security-enforcer-impl/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M testing/conntest/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/schrodingertest/pom.xml
    M testing/story/pom.xml
    M tools/midpoint-war-layout/pom.xml
    M tools/ninja/pom.xml
    M tools/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/schrodinger/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml

  Log Message:
  -----------
  Next development version: 4.3-SNAPSHOT


  Commit: 4eb228bda5d5b7ad5c67fbd251f85f6cbca3dec7
      https://github.com/Evolveum/midpoint/commit/4eb228bda5d5b7ad5c67fbd251f85f6cbca3dec7
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2020-10-23 (Fri, 23 Oct 2020)

  Changed paths:
    M NEWS
    M README
    M README.md
    M RELEASE-NOTES
    M config/initial-objects/000-system-configuration.xml
    M config/initial-objects/030-role-superuser.xml
    M config/initial-objects/040-role-enduser.xml
    M config/initial-objects/041-role-approver.xml
    M config/initial-objects/042-role-reviewer.xml
    M config/initial-objects/043-role-delegator.xml
    M config/initial-objects/050-user-administrator.xml
    A config/initial-objects/060-archetype-report-dashboard.xml
    A config/initial-objects/061-archetype-report-collection.xml
    A config/initial-objects/080-report-audit.xml
    A config/initial-objects/090-report-audit-jasper.xml
    R config/initial-objects/090-report-audit.xml
    M config/initial-objects/100-report-reconciliation.xml
    M config/initial-objects/110-report-user-list.xml
    M config/initial-objects/130-report-certification-definitions.xml
    M config/initial-objects/140-report-certification-campaigns.xml
    M config/initial-objects/150-report-certification-cases.xml
    M config/initial-objects/160-report-certification-decisions.xml
    M config/initial-objects/200-lookup-languages.xml
    M config/initial-objects/210-lookup-locales.xml
    A config/initial-objects/255-object-collection-certification-definition-all.xml
    M config/initial-objects/260-object-collection-task-all.xml
    M config/initial-objects/270-object-collection-task-active.xml
    A config/initial-objects/284-object-collection-audit.xml
    A config/initial-objects/285-object-collection-audit-24h.xml
    A config/initial-objects/290-object-collection-audit-errors-24h.xml
    R config/initial-objects/290-object-collection-audit-errors.xml
    A config/initial-objects/300-object-collection-audit-modifications-24h.xml
    R config/initial-objects/300-object-collection-audit-modifications.xml
    M config/initial-objects/310-dashboard-admin.xml
    M config/initial-objects/504-archetype-task-live-sync.xml
    M config/initial-objects/507-archetype-task-report.xml
    A config/initial-objects/600-origin-internal.xml
    M custom/pom.xml
    M dist/javadoc/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui/pom.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/axiom/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-api/pom.xml
    M infra/prism-impl/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/schema-pure-jaxb/pom.xml
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M model/certification-api/pom.xml
    M model/certification-impl/pom.xml
    M model/model-api/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    M model/model-intest/pom.xml
    M model/model-test/pom.xml
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/rest-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/ucf-api/pom.xml
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-connid/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-common/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/security-api/pom.xml
    M repo/security-enforcer-api/pom.xml
    M repo/security-enforcer-impl/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M testing/conntest/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/schrodingertest/pom.xml
    M testing/story/pom.xml
    M tools/midpoint-war-layout/pom.xml
    M tools/ninja/pom.xml
    M tools/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/schrodinger/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into pre-devel-4.3


  Commit: 2a626d28af0a2df0e25f36fcda5373a63b755c61
      https://github.com/Evolveum/midpoint/commit/2a626d28af0a2df0e25f36fcda5373a63b755c61
  Author: Richard Richter <richard.richter at evolveum.com>
  Date:   2020-10-28 (Wed, 28 Oct 2020)

  Changed paths:
    M NEWS
    M README
    M README.md
    M RELEASE-NOTES
    M config/initial-objects/000-system-configuration.xml
    M config/initial-objects/030-role-superuser.xml
    M config/initial-objects/040-role-enduser.xml
    M config/initial-objects/041-role-approver.xml
    M config/initial-objects/042-role-reviewer.xml
    M config/initial-objects/043-role-delegator.xml
    M config/initial-objects/050-user-administrator.xml
    A config/initial-objects/060-archetype-report-dashboard.xml
    A config/initial-objects/061-archetype-report-collection.xml
    A config/initial-objects/080-report-audit.xml
    A config/initial-objects/090-report-audit-jasper.xml
    R config/initial-objects/090-report-audit.xml
    M config/initial-objects/100-report-reconciliation.xml
    M config/initial-objects/110-report-user-list.xml
    M config/initial-objects/130-report-certification-definitions.xml
    M config/initial-objects/140-report-certification-campaigns.xml
    M config/initial-objects/150-report-certification-cases.xml
    M config/initial-objects/160-report-certification-decisions.xml
    M config/initial-objects/200-lookup-languages.xml
    M config/initial-objects/210-lookup-locales.xml
    A config/initial-objects/255-object-collection-certification-definition-all.xml
    M config/initial-objects/260-object-collection-task-all.xml
    M config/initial-objects/270-object-collection-task-active.xml
    A config/initial-objects/284-object-collection-audit.xml
    A config/initial-objects/285-object-collection-audit-24h.xml
    A config/initial-objects/290-object-collection-audit-errors-24h.xml
    R config/initial-objects/290-object-collection-audit-errors.xml
    A config/initial-objects/300-object-collection-audit-modifications-24h.xml
    R config/initial-objects/300-object-collection-audit-modifications.xml
    M config/initial-objects/310-dashboard-admin.xml
    M config/initial-objects/504-archetype-task-live-sync.xml
    M config/initial-objects/507-archetype-task-report.xml
    A config/initial-objects/600-origin-internal.xml
    M custom/pom.xml
    M dist/javadoc/pom.xml
    M dist/midpoint-api/pom.xml
    M dist/pom.xml
    M gui/admin-gui/pom.xml
    M gui/pom.xml
    M icf-connectors/dummy-connector-fake/pom.xml
    M icf-connectors/dummy-connector/pom.xml
    M icf-connectors/dummy-resource/pom.xml
    M icf-connectors/pom.xml
    M infra/axiom/pom.xml
    M infra/common/pom.xml
    M infra/pom.xml
    M infra/prism-api/pom.xml
    M infra/prism-impl/pom.xml
    M infra/prism-maven-plugin/pom.xml
    M infra/schema-pure-jaxb/pom.xml
    M infra/schema/pom.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ShadowUtil.java
    M infra/test-util/pom.xml
    M infra/util/pom.xml
    M model/certification-api/pom.xml
    M model/certification-impl/pom.xml
    M model/model-api/pom.xml
    M model/model-common/pom.xml
    M model/model-impl/pom.xml
    M model/model-intest/pom.xml
    M model/model-test/pom.xml
    M model/notifications-api/pom.xml
    M model/notifications-impl/pom.xml
    M model/pom.xml
    M model/report-api/pom.xml
    M model/report-impl/pom.xml
    M model/rest-impl/pom.xml
    M model/workflow-api/pom.xml
    M model/workflow-impl/pom.xml
    M pom.xml
    M provisioning/pom.xml
    M provisioning/provisioning-api/pom.xml
    M provisioning/provisioning-impl/pom.xml
    M provisioning/ucf-api/pom.xml
    M provisioning/ucf-impl-builtin/pom.xml
    M provisioning/ucf-impl-connid/pom.xml
    M repo/audit-api/pom.xml
    M repo/audit-impl/pom.xml
    M repo/pom.xml
    M repo/repo-api/pom.xml
    M repo/repo-cache/pom.xml
    M repo/repo-common/pom.xml
    M repo/repo-sql-impl-test/pom.xml
    M repo/repo-sql-impl/pom.xml
    M repo/repo-test-util/pom.xml
    M repo/security-api/pom.xml
    M repo/security-enforcer-api/pom.xml
    M repo/security-enforcer-impl/pom.xml
    M repo/security-impl/pom.xml
    M repo/system-init/pom.xml
    M repo/task-api/pom.xml
    M repo/task-quartz-impl/pom.xml
    M testing/conntest/pom.xml
    M testing/longtest/pom.xml
    M testing/pom.xml
    M testing/rest/pom.xml
    M testing/schrodingertest/pom.xml
    M testing/story/pom.xml
    M tools/midpoint-war-layout/pom.xml
    M tools/ninja/pom.xml
    M tools/pom.xml
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/schrodinger/pom.xml
    M tools/test-ng/pom.xml
    M tools/xjc-plugin/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into feature/repo-test


Compare: https://github.com/Evolveum/midpoint/compare/d611c556b320...2a626d28af0a


More information about the midPoint-svn mailing list