Skip to content

Commit cdaca1d

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 cdaca1d

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,13 @@ public ManagedChannel shutdown() {
7373

7474
@Override
7575
public ManagedChannel shutdownNow() {
76+
ManagedChannel result = super.shutdownNow();
7677
phantom.clearSafely();
7778
// This dummy check prevents the JIT from collecting 'this' too early
7879
if (this.getClass() == null) {
7980
throw new AssertionError();
8081
}
81-
return super.shutdownNow();
82+
return result;
8283
}
8384

8485
@VisibleForTesting

0 commit comments

Comments
 (0)