diff --git a/evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java b/evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java index 865a7975..711ea90f 100644 --- a/evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java +++ b/evcache-core/src/main/java/com/netflix/evcache/EVCacheImpl.java @@ -1918,13 +1918,13 @@ private CompletableFuture> getAsyncBulkData(EVCacheClient return false; }; - final Transcoder valueTranscoder; - if (keyMapDto.getHashedKeysMap() != null && !keyMapDto.getHashedKeysMap().isEmpty()) { - if (log.isDebugEnabled() && shouldLog()) log.debug("fetching bulk data with set of keys containing hashed key(s) {} ", evcacheKeys); - valueTranscoder = tc != null ? tc : (Transcoder) client.getTranscoder(); - } else { - valueTranscoder = tc != null ? tc : (Transcoder) _transcoder; - if (log.isDebugEnabled() && shouldLog()) log.debug("fetching bulk data with no hashed key(s) {} ", plainKeys); + final Transcoder valueTranscoder = (tc == null) ? ((_transcoder == null) ? (Transcoder) client.getTranscoder() : (Transcoder) _transcoder) : tc; + if (log.isDebugEnabled() && shouldLog()) { + if (!keyMapDto.getHashedKeysMap().isEmpty()) { + log.debug("fetching bulk data with set of keys containing hashed key(s) {} ", evcacheKeys); + } else { + log.debug("fetching bulk data with no hashed key(s) {} ", plainKeys); + } } return client.getAsyncBulk(plainKeys, hashedKeys, valueTranscoder, evcacheValueTranscoder, _appName, shouldLog(), collisionChecker) .thenApply(data -> buildKeyValueResult(data, keyMapDto))