[midPoint-git] [Evolveum/midpoint] 358f27: Fix handling of java.lang.Error in ChangeExecutor

mederly noreply at github.com
Wed Mar 10 11:02:21 CET 2021


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 358f27dc1f38fbe330ce0433c602659a580479f8
      https://github.com/Evolveum/midpoint/commit/358f27dc1f38fbe330ce0433c602659a580479f8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-03-09 (Tue, 09 Mar 2021)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationTaskThirdPartExecution.java

  Log Message:
  -----------
  Fix handling of java.lang.Error in ChangeExecutor

The operation result was not updated in such cases.


  Commit: 1eda91d08422949f5e4f3bf69d0181db0d45dae8
      https://github.com/Evolveum/midpoint/commit/1eda91d08422949f5e4f3bf69d0181db0d45dae8
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-03-10 (Wed, 10 Mar 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java
    M gui/admin-gui/src/main/resources/logback.xml
    M infra/axiom/pom.xml
    M infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomAntlrLiterals.java
    A infra/axiom/src/main/java/com/evolveum/axiom/lang/antlr/AxiomStrings.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/lang/QueryWriter.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestBasicQueryConversions.java
    M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/OperationResultAssert.java
    M repo/repo-sqale/sql/pgnew-repo.sql
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/ContainerValueIdGenerator.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/MObjectTypeMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleQueryContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepoContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryBeanConfig.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/operations/AddObjectOperation.java
    R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/MCase.java
    R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QCase.java
    R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/QCaseMapping.java
    R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/SqaleModelMapping.java
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/SqaleNestedMapping.java
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/SqaleTableMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/assignment/AssignmentSqlTransformer.java
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/cases/MCase.java
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/cases/QCase.java
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/cases/QCaseMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/common/MContainer.java
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/common/MContainerType.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/common/QContainer.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/common/QContainerMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/lookuptable/QLookupTableRowMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/ContainerSqlTransformer.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/MObject.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/ObjectSqlTransformer.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QObject.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QObjectMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/ref/QReferenceMapping.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/SqaleRepoAddObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/SequenceHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectDeltaUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/UpdateContext.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/IdGeneratorResult.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlRepoContext.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/QueryModelMapping.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/QueryTableMapping.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/querydsl/QuerydslUtils.java
    A testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/advanced/AbstractAdvancedLabTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/advanced/M1ArchetypeAndObjectCollections.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/fundamental/M8ExtendingMidPointXMLSchema.java
    A testing/schrodingertest/src/test/resources/labs/advanced/M1/orgs/org-example.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/M1/resources/localhost-hr-noextension.xml
    R testing/schrodingertest/src/test/resources/labs/advanced/M1/systemconfiguration/system-configuration-11-2.xml
    R testing/schrodingertest/src/test/resources/labs/advanced/M1/systemconfiguration/system-configuration-11-3.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/000-example-password-policy.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/001-numeric-pin-first-nonzero-policy.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/020-example-security-policy-administrators.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/021-example-security-policy.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/030-lookup-emp-status.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/040-archetype-employee.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/041-archetype-external.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/042-archetype-org-catalog-group.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/043-archetype-org-catalog-root.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/044-archetype-org-company.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/045-archetype-org-functional.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/046-archetype-org-group-list.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/047-archetype-org-group.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/048-archetype-role-project.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/060-objectCollection-active-employees.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/061-objectCollection-former-employees.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/062-objectCollection-inactive-employees.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/080-org-example.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/081-org-secret-ops.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/100-object-template-example-user.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/120-localhost-csvfile-1-document-access.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/121-localhost-csvfile-2-canteen.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/122-localhost-csvfile-3-ldap.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/123-localhost-hr.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/140-role-addressbook-manager.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/141-role-basic-approver.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/142-role-basicuser.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/143-role-incognito.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/144-role-internal-employee.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/145-role-manager.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/146-role-secret-i.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/147-role-secret-ii.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/148-role-top-secret-i.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/300-000-system-configuration.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/900-user-bigbrother.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/901-user-security-officer.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/910-1test-all-resources.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/post-initial-objects/911-recompute-all-organizations.xml
    A testing/schrodingertest/src/test/resources/labs/advanced/schema/extension-example.xsd
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/ProjectionsTab.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/SummaryPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/Table.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/AssignmentHolderDetailsPage.java

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


Compare: https://github.com/Evolveum/midpoint/compare/618e5195e6fb...1eda91d08422


More information about the midPoint-svn mailing list