minor improvement to condition for after execute.

Co-authored-by: Harshit Singh Lodha <[email protected]>
newrelic · Aug 3, 2023 · 4c35ed5 · 4c35ed5
1 parent c0a4127
commit 4c35ed5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/...ain/java/com/newrelic/agent/security/instrumentator/httpclient/RestRequestThreadPool.java b/...ain/java/com/newrelic/agent/security/instrumentator/httpclient/RestRequestThreadPool.java
@@ -54,11 +54,11 @@ protected void afterExecute(Runnable r, Throwable t) {
                 try {
                     super.afterExecute(r, t);
                     String controlCommandId = null;
-                    if (t != null && r instanceof CustomFutureTask<?> && ((CustomFutureTask<?>) r).getTask() instanceof RestRequestProcessor) {
+                    if (r instanceof CustomFutureTask<?> && ((CustomFutureTask<?>) r).getTask() instanceof RestRequestProcessor) {
                         Boolean result = (Boolean) ((CustomFutureTask<?>) r).get();
-                        if(result) {
-                            RestRequestProcessor task = (RestRequestProcessor) ((CustomFutureTask<?>) r).getTask();
-                            controlCommandId = task.getControlCommand().getId();
+                        RestRequestProcessor task = (RestRequestProcessor) ((CustomFutureTask<?>) r).getTask();
+                        controlCommandId = task.getControlCommand().getId();
+                        if(t == null && result) {
                             if (StringUtils.isNotBlank(controlCommandId)) {
                                 if (currentProcessingIds.containsKey(controlCommandId)) {
                                     processedIds.put(controlCommandId, currentProcessingIds.get(controlCommandId));