Merge pull request #1217 from mebigfatguy/master

mattrjacobs · mattrjacobs · commit f5fe3500280c · 2016-05-25T11:21:25.000-07:00
remove dead code around fetching execution collapse info
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/metric/HystrixRequestEvents.java b/hystrix-core/src/main/java/com/netflix/hystrix/metric/HystrixRequestEvents.java
@@ -68,8 +68,6 @@ public Map<ExecutionSignature, List<Integer>> getExecutionsMappedToLatencies() {
                 cachedCount = cachingDetector.get(key);
             }
             ExecutionSignature signature;
-            HystrixCollapserKey collapserKey = execution.getOriginatingCollapserKey();
-            int collapserBatchCount = execution.getNumberCollapsed();
             if (cachedCount > 0) {
                 //this has a RESPONSE_FROM_CACHE and needs to get split off
                 signature = ExecutionSignature.from(execution, cacheKey, cachedCount);

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,6 @@ public Map<ExecutionSignature, List<Integer>> getExecutionsMappedToLatencies() {`
`68`	`68`	`cachedCount = cachingDetector.get(key);`
`69`	`69`	`}`
`70`	`70`	`ExecutionSignature signature;`
`71`		`- HystrixCollapserKey collapserKey = execution.getOriginatingCollapserKey();`
`72`		`- int collapserBatchCount = execution.getNumberCollapsed();`
`73`	`71`	`if (cachedCount > 0) {`
`74`	`72`	`//this has a RESPONSE_FROM_CACHE and needs to get split off`
`75`	`73`	`signature = ExecutionSignature.from(execution, cacheKey, cachedCount);`