Changed canonicalKey ref from variable to method

smadappa · smadappa · commit b6f86e1bfef9 · 2020-10-19T11:21:10.000-07:00
diff --git a/evcache-core/src/main/java/com/netflix/evcache/EVCacheKey.java b/evcache-core/src/main/java/com/netflix/evcache/EVCacheKey.java
@@ -125,7 +125,7 @@ private String getHashKey(HashingAlgorithm hashingAlgorithm, Boolean shouldEncod
         final String key = hashingAlgorithm.toString()+ maxDigestBytes != null ? maxDigestBytes.toString() : "-" + maxHashLength != null ? maxHashLength.toString() : "-" + encoder != null ? encoder : "-";
         String val = hashedKeysByAlgorithm.get(key);
         if(val == null) {
-            val = KeyHasher.getHashedKeyEncoded(canonicalKey, hashingAlgorithm, maxDigestBytes, maxHashLength, encoder);
+            val = KeyHasher.getHashedKeyEncoded(getCanonicalKey(false), hashingAlgorithm, maxDigestBytes, maxHashLength, encoder);
             hashedKeysByAlgorithm.put(key , val);
         }
         if (log.isDebugEnabled()) log.debug("getHashKey : " + val);

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ private String getHashKey(HashingAlgorithm hashingAlgorithm, Boolean shouldEncod`
`125`	`125`	`final String key = hashingAlgorithm.toString()+ maxDigestBytes != null ? maxDigestBytes.toString() : "-" + maxHashLength != null ? maxHashLength.toString() : "-" + encoder != null ? encoder : "-";`
`126`	`126`	`String val = hashedKeysByAlgorithm.get(key);`
`127`	`127`	`if(val == null) {`
`128`		`- val = KeyHasher.getHashedKeyEncoded(canonicalKey, hashingAlgorithm, maxDigestBytes, maxHashLength, encoder);`
	`128`	`+ val = KeyHasher.getHashedKeyEncoded(getCanonicalKey(false), hashingAlgorithm, maxDigestBytes, maxHashLength, encoder);`
`129`	`129`	`hashedKeysByAlgorithm.put(key , val);`
`130`	`130`	`}`
`131`	`131`	`if (log.isDebugEnabled()) log.debug("getHashKey : " + val);`