File tree Expand file tree Collapse file tree 3 files changed +6
-18
lines changed
core/src/java/org/apache/solr/core
test-framework/src/java/org/apache/solr Expand file tree Collapse file tree 3 files changed +6
-18
lines changed Original file line number Diff line number Diff line change @@ -1138,9 +1138,7 @@ public void shutdown() {
11381138 } finally {
11391139 try {
11401140 if (updateShardHandler != null ) {
1141- customThreadPool .submit (() -> Collections .singleton (shardHandlerFactory ).parallelStream ().forEach (c -> {
1142- updateShardHandler .close ();
1143- }));
1141+ customThreadPool .submit (() -> updateShardHandler .close ());
11441142 }
11451143 } finally {
11461144 try {
Original file line number Diff line number Diff line change @@ -414,9 +414,7 @@ protected String getShardsString() {
414414 protected void destroyServers () throws Exception {
415415 ExecutorService customThreadPool = ExecutorUtil .newMDCAwareCachedThreadPool (new SolrNamedThreadFactory ("closeThreadPool" ));
416416
417- customThreadPool .submit (() -> Collections .singleton (controlClient ).parallelStream ().forEach (c -> {
418- IOUtils .closeQuietly (c );
419- }));
417+ customThreadPool .submit (() -> IOUtils .closeQuietly (controlClient ));
420418
421419 customThreadPool .submit (() -> {
422420 try {
Original file line number Diff line number Diff line change @@ -1732,25 +1732,17 @@ public void distribTearDown() throws Exception {
17321732 protected void destroyServers () throws Exception {
17331733 ExecutorService customThreadPool = ExecutorUtil .newMDCAwareCachedThreadPool (new SolrNamedThreadFactory ("closeThreadPool" ));
17341734
1735- customThreadPool .submit (() -> Collections .singleton (commonCloudSolrClient ).parallelStream ().forEach (c -> {
1736- IOUtils .closeQuietly (c );
1737- }));
1735+ customThreadPool .submit (() -> IOUtils .closeQuietly (commonCloudSolrClient ));
17381736
1739- customThreadPool .submit (() -> Collections .singleton (controlClient ).parallelStream ().forEach (c -> {
1740- IOUtils .closeQuietly (c );
1741- }));
1737+ customThreadPool .submit (() -> IOUtils .closeQuietly (controlClient ));
17421738
17431739 customThreadPool .submit (() -> coreClients .parallelStream ().forEach (c -> {
17441740 IOUtils .closeQuietly (c );
17451741 }));
17461742
1747- customThreadPool .submit (() -> Collections .singletonList (controlClientCloud ).parallelStream ().forEach (c -> {
1748- IOUtils .closeQuietly (c );
1749- }));
1743+ customThreadPool .submit (() -> IOUtils .closeQuietly (controlClientCloud ));
17501744
1751- customThreadPool .submit (() -> Collections .singletonList (cloudClient ).parallelStream ().forEach (c -> {
1752- IOUtils .closeQuietly (c );
1753- }));
1745+ customThreadPool .submit (() -> IOUtils .closeQuietly (cloudClient ));
17541746
17551747 ExecutorUtil .shutdownAndAwaitTermination (customThreadPool );
17561748
You can’t perform that action at this time.
0 commit comments