@@ -228,11 +228,6 @@ public void uncaughtException(Thread t, Throwable e) {
228228 @ Nullable
229229 private LbHelperImpl lbHelper ;
230230
231- // Must ONLY be assigned from updateSubchannelPicker(), which is called from syncContext.
232- // null if channel is in idle mode.
233- @ Nullable
234- private volatile SubchannelPicker subchannelPicker ;
235-
236231 // Must be accessed from the syncContext
237232 private boolean panicMode ;
238233
@@ -259,8 +254,7 @@ public void uncaughtException(Thread t, Throwable e) {
259254 // Channel's shutdown process:
260255 // 1. shutdown(): stop accepting new calls from applications
261256 // 1a shutdown <- true
262- // 1b subchannelPicker <- null
263- // 1c delayedTransport.shutdown()
257+ // 1b delayedTransport.shutdown()
264258 // 2. delayedTransport terminated: stop stream-creation functionality
265259 // 2a terminating <- true
266260 // 2b loadBalancer.shutdown()
@@ -393,7 +387,6 @@ private void shutdownNameResolverAndLoadBalancer(boolean channelIsActive) {
393387 lbHelper .lb .shutdown ();
394388 lbHelper = null ;
395389 }
396- subchannelPicker = null ;
397390 }
398391
399392 /**
@@ -804,7 +797,6 @@ boolean isInPanicMode() {
804797
805798 // Called from syncContext
806799 private void updateSubchannelPicker (SubchannelPicker newPicker ) {
807- subchannelPicker = newPicker ;
808800 delayedTransport .reprocess (newPicker );
809801 }
810802
@@ -1228,9 +1220,6 @@ final class RequestConnection implements Runnable {
12281220 @ Override
12291221 public void run () {
12301222 exitIdleMode ();
1231- if (subchannelPicker != null ) {
1232- subchannelPicker .requestConnection ();
1233- }
12341223 if (lbHelper != null ) {
12351224 lbHelper .lb .requestConnection ();
12361225 }
0 commit comments