diff --git a/anchored-keys/src/main/java/org/infinispan/anchored/impl/AnchoredDistributionInterceptor.java b/anchored-keys/src/main/java/org/infinispan/anchored/impl/AnchoredDistributionInterceptor.java
index 9806f468d64a..56953110e55b 100644
--- a/anchored-keys/src/main/java/org/infinispan/anchored/impl/AnchoredDistributionInterceptor.java
+++ b/anchored-keys/src/main/java/org/infinispan/anchored/impl/AnchoredDistributionInterceptor.java
@@ -35,6 +35,7 @@
import org.infinispan.remoting.transport.Address;
import org.infinispan.remoting.transport.impl.MapResponseCollector;
import org.infinispan.commons.util.concurrent.CompletableFutures;
+import org.infinispan.util.CacheTopologyUtil;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -67,7 +68,7 @@ protected Object primaryReturnHandler(InvocationContext ctx, AbstractDataWriteCo
command);
return localResult;
}
- LocalizedCacheTopology cacheTopology = checkTopologyId(command);
+ LocalizedCacheTopology cacheTopology = CacheTopologyUtil.checkTopology(command, distributionManager.getCacheTopology());
DistributionInfo distributionInfo = cacheTopology.getSegmentDistribution(command.getSegment());
Collection
owners = distributionInfo.writeOwners();
diff --git a/core/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java b/core/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java
index 08b88e48168c..c783a173a9bb 100644
--- a/core/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java
+++ b/core/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java
@@ -66,6 +66,7 @@
import org.infinispan.statetransfer.OutdatedTopologyException;
import org.infinispan.transaction.xa.GlobalTransaction;
import org.infinispan.commons.util.concurrent.CompletableFutures;
+import org.infinispan.util.CacheTopologyUtil;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -132,7 +133,7 @@ protected DistributionInfo retrieveDistributionInfo(LocalizedCacheTopology topol
*/
protected CompletionStage remoteGetSingleKey(
InvocationContext ctx, C command, Object key, boolean isWrite) {
- LocalizedCacheTopology cacheTopology = checkTopologyId(command);
+ LocalizedCacheTopology cacheTopology = CacheTopologyUtil.checkTopology(command, getCacheTopology());
int topologyId = cacheTopology.getTopologyId();
DistributionInfo info = retrieveDistributionInfo(cacheTopology, command, key);
@@ -190,7 +191,7 @@ protected final Object handleNonTxWriteCommand(InvocationContext ctx, AbstractDa
return invokeNext(ctx, command);
}
- LocalizedCacheTopology cacheTopology = checkTopologyId(command);
+ LocalizedCacheTopology cacheTopology = CacheTopologyUtil.checkTopology(command, getCacheTopology());
DistributionInfo info = cacheTopology.getSegmentDistribution(SegmentSpecificCommand.extractSegment(command, key,
keyPartitioner));
@@ -232,7 +233,7 @@ protected Object primaryReturnHandler(InvocationContext ctx, AbstractDataWriteCo
if (log.isTraceEnabled()) log.tracef("Skipping the replication of the conditional command as it did not succeed on primary owner (%s).", command);
return localResult;
}
- LocalizedCacheTopology cacheTopology = checkTopologyId(command);
+ LocalizedCacheTopology cacheTopology = CacheTopologyUtil.checkTopology(command, getCacheTopology());
int segment = SegmentSpecificCommand.extractSegment(command, command.getKey(), keyPartitioner);
DistributionInfo distributionInfo = cacheTopology.getSegmentDistribution(segment);
Collection owners = distributionInfo.writeOwners();
@@ -302,7 +303,7 @@ CompletionStage remoteGetMany(InvocationContext ctx, C command, Collection
private
CompletionStage doRemoteGetMany(InvocationContext ctx, C command, Collection> keys,
Map