check for segmentation being disabled

infinispan · Jan 23, 2020 · 5e76619 · 5e76619
1 parent 23a6d22
commit 5e76619
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/core/src/main/java/org/infinispan/factories/InternalCacheFactory.java b/core/src/main/java/org/infinispan/factories/InternalCacheFactory.java
@@ -34,6 +34,7 @@
 import org.infinispan.context.impl.FlagBitSets;
 import org.infinispan.context.impl.ImmutableContext;
 import org.infinispan.distribution.ch.KeyPartitioner;
+import org.infinispan.distribution.ch.impl.SingleSegmentKeyPartitioner;
 import org.infinispan.encoding.DataConversion;
 import org.infinispan.eviction.ActivationManager;
 import org.infinispan.eviction.PassivationManager;
@@ -281,7 +282,12 @@ public void wireRealCache() {
       protected void internalWire(T cache) {
          componentRegistry = cache.componentRegistry;
          expirationManager = cache.expirationManager;
-         keyPartitioner = cache.keyPartitioner;
+         if (componentRegistry.getGlobalComponentRegistry().getGlobalConfiguration().features().isAvailable(
+               DataContainerFactory.SEGMENTATION_FEATURE)) {
+            keyPartitioner = cache.keyPartitioner;
+         } else {
+            keyPartitioner = SingleSegmentKeyPartitioner.getInstance();
+         }
          wireRealCache();
       }