HV-1088 Making sure non-default constraint validators are released when removed from the cache;

Author: gunnarmorling

engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintValidatorManager.java

@@ -11,8 +11,10 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.validation.ConstraintValidator;
@@ -187,15 +189,15 @@ private <V, A extends Annotation> ConstraintValidator<A, V> createAndInitializeV
 	}
 
 	private void clearEntriesForFactory(ConstraintValidatorFactory constraintFactory) {
-		List<CacheKey> entriesToRemove = new ArrayList<CacheKey>();
-		for ( Map.Entry<CacheKey, ConstraintValidator<?, ?>> entry : constraintValidatorCache.entrySet() ) {
-			if ( entry.getKey().getConstraintFactory() == constraintFactory ) {
-				entriesToRemove.add( entry.getKey() );
+		Iterator<Entry<CacheKey, ConstraintValidator<?, ?>>> cacheEntries = constraintValidatorCache.entrySet().iterator();
+
+		while ( cacheEntries.hasNext() ) {
+			Entry<CacheKey, ConstraintValidator<?, ?>> cacheEntry = cacheEntries.next();
+			if ( cacheEntry.getKey().getConstraintFactory() == constraintFactory ) {
+				constraintFactory.releaseInstance( cacheEntry.getValue() );
+				cacheEntries.remove();
 			}
 		}
-		for ( CacheKey key : entriesToRemove ) {
-			constraintValidatorCache.remove( key );
-		}
 	}
 
 	public void clear() {