commit 8235078696ca48494ee3bb9124e73542db7ee579
author Lukasz Swiatek <l.swiatek@oberthur.com> Fri Aug 02 14:51:40 2019 +0200
committer Lukasz Swiatek <l.swiatek@oberthur.com> Fri Aug 02 14:51:40 2019 +0200
tree 6e6f84aa13ad4e156a2e8819c6bb58d4f0c66fdc
parent df96952b844c0c09e65e0c69ac874f2fba928397

BVAL-177 fixed race condition during validator creation/initilization

bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java

diff --git a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java
index 5b51141..05ab691 100644
--- a/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java
+++ b/bval-jsr/src/main/java/org/apache/bval/jsr/ConstraintValidation.java
@@ -155,11 +155,12 @@
             synchronized (this) {
                 if (validator == null) {
                     try {
-                        validator = getConstraintValidator(context.getConstraintValidatorFactory(), annotation,
-                            validatorClasses, owner, access);
-                        if (validator != null) {
-                            validator.initialize(annotation);
+                        ConstraintValidator<T, ? super T> constraintValidator = getConstraintValidator(
+                                context.getConstraintValidatorFactory(), annotation, validatorClasses, owner, access);
+                        if (constraintValidator != null) {
+                            constraintValidator.initialize(annotation);
                         }
+                        validator = constraintValidator;
                     } catch (final RuntimeException re) {
                         if (ValidationException.class.isInstance(re)) {
                             throw re;