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

kannanjgithub · kannanjgithub · commit cea04f22d55d · 2026-03-26T05:31:11.000Z
diff --git a/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java b/core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java
@@ -73,13 +73,12 @@ 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 result;
+    return super.shutdownNow();
   }
 
   @VisibleForTesting

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