HV-740 REverting change to BootstrapConfigurationImpl

hferentschik · hferentschik · commit a1555c237f37 · 2013-03-11T12:00:46.000+01:00
diff --git a/engine/src/main/java/org/hibernate/validator/internal/xml/BootstrapConfigurationImpl.java b/engine/src/main/java/org/hibernate/validator/internal/xml/BootstrapConfigurationImpl.java
@@ -89,10 +89,8 @@ private Set<ExecutableType> prepareValidatedExecutableTypes(EnumSet<ExecutableTy
 		if ( validatedExecutableTypes.contains( ExecutableType.ALL ) ) {
 			return EnumSet.complementOf( EnumSet.of( ExecutableType.ALL, ExecutableType.NONE ) );
 		}
-		else if ( validatedExecutableTypes.contains( ExecutableType.NONE ) && validatedExecutableTypes.size() > 1 ) {
-			EnumSet<ExecutableType> enumSet = EnumSet.copyOf( validatedExecutableTypes );
-			enumSet.remove( ExecutableType.NONE );
-			return enumSet;
+		else if ( validatedExecutableTypes.contains( ExecutableType.NONE ) ) {
+			return EnumSet.noneOf( ExecutableType.class );
 		}
 		else {
 			return validatedExecutableTypes;

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,8 @@ private Set<ExecutableType> prepareValidatedExecutableTypes(EnumSet<ExecutableTy`
`89`	`89`	`if ( validatedExecutableTypes.contains( ExecutableType.ALL ) ) {`
`90`	`90`	`return EnumSet.complementOf( EnumSet.of( ExecutableType.ALL, ExecutableType.NONE ) );`
`91`	`91`	`}`
`92`		`- else if ( validatedExecutableTypes.contains( ExecutableType.NONE ) && validatedExecutableTypes.size() > 1 ) {`
`93`		`- EnumSet<ExecutableType> enumSet = EnumSet.copyOf( validatedExecutableTypes );`
`94`		`- enumSet.remove( ExecutableType.NONE );`
`95`		`- return enumSet;`
	`92`	`+ else if ( validatedExecutableTypes.contains( ExecutableType.NONE ) ) {`
	`93`	`+ return EnumSet.noneOf( ExecutableType.class );`
`96`	`94`	`}`
`97`	`95`	`else {`
`98`	`96`	`return validatedExecutableTypes;`