Merge pull request #1903 from newrelic/ning-fix

Ning memory leak fix
newrelic · May 20, 2024 · c20f632 · c20f632
2 parents cd3d269 + 2d93bed
commit c20f632
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 34 deletions.
diff --git a/...client-1.0/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java b/...client-1.0/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java
@@ -73,12 +73,13 @@ public void onThrowable(Throwable t) {
                     .build());
             // This used to be segment.finish(t), but the agent doesn't automatically report it.
             segment.end();
-            segment = null;
-            uri = null;
-            inboundHeaders = null;
-            responseStatus = null;
-            userAbortedOnStatusReceived = null;
         }
+        responseStatus = null;
+        segment = null;
+        uri = null;
+        inboundHeaders = null;
+        userAbortedOnStatusReceived = null;
+
         Weaver.callOriginal();
     }
 
@@ -116,12 +117,12 @@ public T onCompleted() throws Exception {
                     .build());
             //This used to be segment.finish(t), but the agent doesn't automatically report t.
             segment.end();
-            segment = null;
-            uri = null;
-            inboundHeaders = null;
-            responseStatus = null;
-            userAbortedOnStatusReceived = null;
         }
+        responseStatus = null;
+        segment = null;
+        uri = null;
+        inboundHeaders = null;
+        userAbortedOnStatusReceived = null;
 
         return Weaver.callOriginal();
     }

diff --git a/...client-1.1/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java b/...client-1.1/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java
@@ -70,12 +70,13 @@ public void onThrowable(Throwable t) {
                     .build());
             // This used to be segment.finish(t), but the agent doesn't automatically report it.
             segment.end();
-            segment = null;
-            uri = null;
-            inboundHeaders = null;
-            responseStatus = null;
-            userAbortedOnStatusReceived = null;
         }
+        responseStatus = null;
+        segment = null;
+        uri = null;
+        inboundHeaders = null;
+        userAbortedOnStatusReceived = null;
+
         Weaver.callOriginal();
     }
 
@@ -106,19 +107,18 @@ public T onCompleted() throws Exception {
                     .build());
             //This used to be segment.finish(t), but the agent doesn't automatically report t.
             segment.end();
-            segment = null;
-            uri = null;
-            inboundHeaders = null;
-            responseStatus = null;
-            userAbortedOnStatusReceived = null;
         }
+        responseStatus = null;
+        segment = null;
+        uri = null;
+        inboundHeaders = null;
+        userAbortedOnStatusReceived = null;
 
         return Weaver.callOriginal();
     }
 
     private Integer getStatusCode() {
-        if (responseStatus != null)
-        {
+        if (responseStatus != null) {
             return responseStatus.getStatusCode();
         }
         return null;

diff --git a/...ient-1.6.1/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java b/...ient-1.6.1/src/main/java/com/nr/agent/instrumentation/asynchttpclient/NRAsyncHandler.java
@@ -70,12 +70,13 @@ public void onThrowable(Throwable t) {
                     .build());
             //This used to be segment.finish(t), but the agent doesn't automatically report t.
             segment.end();
-            segment = null;
-            uri = null;
-            inboundHeaders = null;
-            responseStatus = null;
-            userAbortedOnStatusReceived = null;
         }
+        segment = null;
+        uri = null;
+        inboundHeaders = null;
+        userAbortedOnStatusReceived = null;
+        responseStatus = null;
+
         Weaver.callOriginal();
     }
 
@@ -106,19 +107,18 @@ public T onCompleted() throws Exception {
                     .build());
             // This used to be segment.finish(t), but the agent doesn't automatically report it.
             segment.end();
-            segment = null;
-            uri = null;
-            inboundHeaders = null;
-            responseStatus = null;
-            userAbortedOnStatusReceived = null;
         }
+        responseStatus = null;
+        segment = null;
+        uri = null;
+        inboundHeaders = null;
+        userAbortedOnStatusReceived = null;
 
         return Weaver.callOriginal();
     }
 
     private Integer getStatusCode() {
-        if (responseStatus != null)
-        {
+        if (responseStatus != null) {
             return responseStatus.getStatusCode();
         }
         return null;