From ef45c6cb4c1fb9c8e072ec9a2775772e9c673d0a Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 12 Feb 2018 21:20:01 +0100 Subject: [PATCH] HV-1568 Replaced null check/initialization with not null assertion - As default context cannot be null at this point we should have an assertion instead of initialization on null. --- .../validator/internal/engine/ValidatorFactoryImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryImpl.java b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryImpl.java index 5a2ecde0e6..524e6d2423 100644 --- a/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryImpl.java +++ b/engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorFactoryImpl.java @@ -45,6 +45,7 @@ import org.hibernate.validator.internal.metadata.provider.MetaDataProvider; import org.hibernate.validator.internal.metadata.provider.ProgrammaticMetaDataProvider; import org.hibernate.validator.internal.metadata.provider.XmlMetaDataProvider; +import org.hibernate.validator.internal.util.Contracts; import org.hibernate.validator.internal.util.ExecutableHelper; import org.hibernate.validator.internal.util.ExecutableParameterNameProvider; import org.hibernate.validator.internal.util.StringHelper; @@ -741,8 +742,9 @@ static class Builder { private boolean traversableResolverResultCacheEnabled; Builder(ValidatorFactoryScopedContext defaultContext) { - this.defaultContext = defaultContext != null ? defaultContext : new ValidatorFactoryScopedContext( null, null, null, null, null, null, false, false ); + Contracts.assertNotNull( defaultContext, "Default context cannot be null." ); + this.defaultContext = defaultContext; this.messageInterpolator = defaultContext.messageInterpolator; this.traversableResolver = defaultContext.traversableResolver; this.parameterNameProvider = defaultContext.parameterNameProvider;