[midPoint-git] [Evolveum/midpoint] e4b5a0: npe fixes

[kate]

  Branch: refs/heads/support-3.7
  Home:   https://github.com/Evolveum/midpoint
  Commit: e4b5a0f81dc8f9a515c8011feb7e66dc79570112
      https://github.com/Evolveum/midpoint/commit/e4b5a0f81dc8f9a515c8011feb7e66dc79570112
  Author: kate <honchar at evolveum.com>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java

  Log Message:
  -----------
  npe fixes

# Conflicts:
#	gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/InducedEntitlementsPanel.java


  Commit: e4f3003f5c27abdb22b2c16ccf247f5399865b0e
      https://github.com/Evolveum/midpoint/commit/e4f3003f5c27abdb22b2c16ccf247f5399865b0e
  Author: kate <honchar at evolveum.com>
  Date:   2018-03-29 (Thu, 29 Mar 2018)

  Changed paths:
    M gui/admin-gui/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/password/PasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/MidPointSpringApplication.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/StaticWebServlet.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAccountActivation.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/crypto/CryptoUtil.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismProperty.java
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ProtectedDataType.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SchemaDebugUtil.java
    M infra/schema/src/main/resources/localization/schema.properties
    M infra/schema/src/main/resources/localization/schema_en.properties
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/PrettyPrinter.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/credentials/CredentialsProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/CompositeConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ConstraintEvaluatorHelper.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/MultiplicityConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ObjectModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/PolicySituationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/StateConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/TransitionConstraintEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
    A model/model-intest/src/test/resources/entitlements/role-org-grouping-repo.xml
    A model/model-intest/src/test/resources/entitlements/role-org-grouping.xml
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/security/role-assign-org.xml
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/ObjectSecurityConstraints.java
    M repo/security-enforcer-api/src/main/java/com/evolveum/midpoint/security/enforcer/api/SecurityEnforcer.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/ObjectSecurityConstraintsImpl.java
    M repo/security-enforcer-impl/src/main/java/com/evolveum/midpoint/security/enforcer/impl/SecurityEnforcerImpl.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java
    M testing/conntest/src/test/resources/truststore.jks
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    A testing/rest/src/test/resources/repo/json/script-generate-passwords.json
    A testing/rest/src/test/resources/repo/json/script-modify-validTo.json
    A testing/rest/src/test/resources/repo/user-jack.xml
    A testing/rest/src/test/resources/repo/xml/script-generate-passwords.xml
    A testing/rest/src/test/resources/repo/xml/script-modify-validTo.xml
    A testing/rest/src/test/resources/repo/yaml/script-generate-passwords.yml
    A testing/rest/src/test/resources/repo/yaml/script-modify-validTo.yml
    M testing/story/src/test/resources/delivery/rules/k20.xml
    M testing/story/src/test/resources/delivery/rules/library.xml
    M weblogic-build/pom.xml

  Log Message:
  -----------
  Merge branch 'support-3.7' of https://github.com/Evolveum/midpoint into support-3.7


Compare: https://github.com/Evolveum/midpoint/compare/71edec9ae494...e4f3003f5c27