Skip to content

Commit ec32ad7

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 cf85526 commit ec32ad7

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
@@ -72,13 +72,12 @@ public ManagedChannel shutdown() {
7272

7373
@Override
7474
public ManagedChannel shutdownNow() {
75-
ManagedChannel result = super.shutdownNow();
7675
phantom.clearSafely();
7776
// This dummy check prevents the JIT from collecting 'this' too early
7877
if (this.getClass() == null) {
7978
throw new AssertionError();
8079
}
81-
return result;
80+
return super.shutdownNow();
8281
}
8382

8483
@VisibleForTesting

0 commit comments

Comments
 (0)