make sure to use the appropriate key partitioner for real!

infinispan · Jan 31, 2020 · a44ae6e · a44ae6e
1 parent f2e7f54
commit a44ae6e
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/core/src/main/java/org/infinispan/factories/InternalCacheFactory.java b/core/src/main/java/org/infinispan/factories/InternalCacheFactory.java
@@ -267,6 +267,9 @@ public AbstractGetAdvancedCache(AdvancedCache<K, V> cache, AdvancedCacheWrapper<
       public void wireRealCache() {
          // Wire the cache to ensure all components are ready
          componentRegistry.wireDependencies(cache);
+
+         keyPartitioner = componentRegistry.getGlobalComponentRegistry().getGlobalConfiguration().features().isAvailable(
+               DataContainerFactory.SEGMENTATION_FEATURE) ? keyPartitioner : SingleSegmentKeyPartitioner.getInstance();
       }
 
       /**
@@ -279,12 +282,7 @@ public void wireRealCache() {
       protected void internalWire(T cache) {
          componentRegistry = cache.componentRegistry;
          expirationManager = cache.expirationManager;
-         if (componentRegistry.getGlobalComponentRegistry().getGlobalConfiguration().features().isAvailable(
-               DataContainerFactory.SEGMENTATION_FEATURE)) {
-            keyPartitioner = cache.keyPartitioner;
-         } else {
-            keyPartitioner = SingleSegmentKeyPartitioner.getInstance();
-         }
+         keyPartitioner = cache.keyPartitioner;
          wireRealCache();
       }