From 12a1b3c225b61a99b141bd89a9f56235ac09ce62 Mon Sep 17 00:00:00 2001 From: Gail Badner Date: Sun, 12 Mar 2017 23:53:38 -0700 Subject: [PATCH] HHH-11516 : Level two cache may not be enabled when using @Cacheable without/instead of @Cache --- .../main/java/org/hibernate/cfg/AnnotationBinder.java | 11 +++-------- 1 file changed, 3 insertions(+), 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 index 5e04a9d4611f..66e4cf2068bc 100644 --- a/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java +++ b/hibernate-core/src/main/java/org/hibernate/cfg/AnnotationBinder.java @@ -1156,15 +1156,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" })