HHH-11516 : Level two cache may not be enabled when using @Cacheable …

…without/instead of @Cache (cherry picked from commit 7c870ac)
hibernate · Mar 13, 2017 · 3b75488 · 3b75488
1 parent f1abc98
commit 3b75488
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java
@@ -1144,15 +1144,10 @@ private static Cache buildCacheMock(String region, MetadataBuildingContext conte
 		return new LocalCacheAnnotationImpl( region, determineCacheConcurrencyStrategy( context ) );
 	}
 
-	private static CacheConcurrencyStrategy DEFAULT_CACHE_CONCURRENCY_STRATEGY;
-
 	private static CacheConcurrencyStrategy determineCacheConcurrencyStrategy(MetadataBuildingContext context) {
-		if ( DEFAULT_CACHE_CONCURRENCY_STRATEGY == null ) {
-			DEFAULT_CACHE_CONCURRENCY_STRATEGY = CacheConcurrencyStrategy.fromAccessType(
-					context.getBuildingOptions().getImplicitCacheAccessType()
-			);
-		}
-		return DEFAULT_CACHE_CONCURRENCY_STRATEGY;
+		return CacheConcurrencyStrategy.fromAccessType(
+				context.getBuildingOptions().getImplicitCacheAccessType()
+		);
 	}
 
 	@SuppressWarnings({ "ClassExplicitlyAnnotation" })