Skip to content

Commit 20d9eff

Browse files
committed
Remove extraneous changes beyond avoiding the false positive warnings, since super.shutdown() is never expected to throw.
Also remove redundant unit test. Rework of PR grpc#12705.
1 parent cea04f2 commit 20d9eff

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

core/src/main/java/io/grpc/internal/ManagedChannelOrphanWrapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,12 @@ final class ManagedChannelOrphanWrapper extends ForwardingManagedChannel {
6262

6363
@Override
6464
public ManagedChannel shutdown() {
65-
ManagedChannel result = super.shutdown();
6665
phantom.clearSafely();
6766
// This dummy check prevents the JIT from collecting 'this' too early
6867
if (this.getClass() == null) {
6968
throw new AssertionError();
7069
}
71-
return result;
70+
return super.shutdown();
7271
}
7372

7473
@Override

0 commit comments

Comments
 (0)