Avoid npe in SpringContextInstallStage when interrupted (sofastack#1280

) avoid npe in SpringContextInstallStage when interrupted --------- Co-authored-by: 致节 <hzj266771@antgroup.com>
Mu-L · Jan 16, 2024 · 73662f9 · 73662f9
1 parent 1dc7854
commit 73662f9
Showing 1 changed file with 28 additions and 25 deletions.
diff --git a/...le-sofa-boot/src/main/java/com/alipay/sofa/boot/isle/stage/SpringContextInstallStage.java b/...le-sofa-boot/src/main/java/com/alipay/sofa/boot/isle/stage/SpringContextInstallStage.java
@@ -186,34 +186,37 @@ private void doRefreshSpringContextParallel() {
      */
     private void refreshRecursively(DeploymentDescriptor deployment,
                                   CountDownLatch latch, List<Future<?>> futures) {
-        futures.add(moduleRefreshExecutorService.submit(() -> {
-            String oldName = Thread.currentThread().getName();
-            try {
-                Thread.currentThread().setName(
-                        "sofa-module-refresh-" + deployment.getModuleName());
-                if (deployment.isSpringPowered() && !application.getFailed().contains(deployment)) {
-                    refreshAndCollectCost(deployment);
-                }
-                DependencyTree.Entry<String, DeploymentDescriptor> entry = application
-                        .getDeployRegistry().getEntry(deployment.getModuleName());
-                if (entry != null && entry.getDependsOnMe() != null) {
-                    for (DependencyTree.Entry<String, DeploymentDescriptor> child : entry
-                            .getDependsOnMe()) {
-                        child.getDependencies().remove(entry);
-                        if (child.getDependencies().size() == 0) {
-                            refreshRecursively(child.get(), latch, futures);
+        // if interrupted, moduleRefreshExecutorService will be null;
+        if (moduleRefreshExecutorService != null) {
+            futures.add(moduleRefreshExecutorService.submit(() -> {
+                String oldName = Thread.currentThread().getName();
+                try {
+                    Thread.currentThread().setName(
+                            "sofa-module-refresh-" + deployment.getModuleName());
+                    if (deployment.isSpringPowered() && !application.getFailed().contains(deployment)) {
+                        refreshAndCollectCost(deployment);
+                    }
+                    DependencyTree.Entry<String, DeploymentDescriptor> entry = application
+                            .getDeployRegistry().getEntry(deployment.getModuleName());
+                    if (entry != null && entry.getDependsOnMe() != null) {
+                        for (DependencyTree.Entry<String, DeploymentDescriptor> child : entry
+                                .getDependsOnMe()) {
+                            child.getDependencies().remove(entry);
+                            if (child.getDependencies().size() == 0) {
+                                refreshRecursively(child.get(), latch, futures);
+                            }
                         }
                     }
+                } catch (Throwable t) {
+                    LOGGER.error(ErrorCode.convert("01-11002", deployment.getName()), t);
+                    throw new RuntimeException(ErrorCode.convert("01-11002", deployment.getName()),
+                            t);
+                } finally {
+                    latch.countDown();
+                    Thread.currentThread().setName(oldName);
                 }
-            } catch (Throwable t) {
-                LOGGER.error(ErrorCode.convert("01-11002", deployment.getName()), t);
-                throw new RuntimeException(ErrorCode.convert("01-11002", deployment.getName()),
-                        t);
-            } finally {
-                latch.countDown();
-                Thread.currentThread().setName(oldName);
-            }
-        }));
+            }));
+        }
     }
 
     protected void refreshAndCollectCost(DeploymentDescriptor deployment) {