Merge remote-tracking branch 'origin/rework-orphan-wrapper-pr' into rework-orphan-wrapper-pr

kannanjgithub · kannanjgithub · commit cf85526df4cb · 2026-03-26T05:36:02.000Z
diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java b/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java
@@ -72,12 +72,13 @@ public ManagedChannel shutdown() {
 
   @Override
   public ManagedChannel shutdownNow() {
+    ManagedChannel result = super.shutdownNow();
     phantom.clearSafely();
     // This dummy check prevents the JIT from collecting 'this' too early
     if (this.getClass() == null) {
       throw new AssertionError();
     }
-    return super.shutdownNow();
+    return result;
   }
 
   @VisibleForTesting

Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,13 @@ public ManagedChannel shutdown() {`
`72`	`72`
`73`	`73`	`@Override`
`74`	`74`	`public ManagedChannel shutdownNow() {`
	`75`	`+ ManagedChannel result = super.shutdownNow();`
`75`	`76`	`phantom.clearSafely();`
`76`	`77`	`// This dummy check prevents the JIT from collecting 'this' too early`
`77`	`78`	`if (this.getClass() == null) {`
`78`	`79`	`throw new AssertionError();`
`79`	`80`	`}`
`80`		`- return super.shutdownNow();`
	`81`	`+ return result;`
`81`	`82`	`}`
`82`	`83`
`83`	`84`	`@VisibleForTesting`