Ensure that failed places prevent server startup only when configured…

… to do so.
NationalSecurityAgency · Nov 9, 2023 · c13889b · c13889b
1 parent 5794d03
commit c13889b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/emissary/admin/Startup.java b/src/main/java/emissary/admin/Startup.java
@@ -515,9 +515,11 @@ public boolean verifyNoInvisiblePlacesStarted() {
         try {
             IDirectoryPlace dirPlace = DirectoryPlace.lookup();
             List<DirectoryEntry> dirEntries = dirPlace.getEntries();
-            for (DirectoryEntry currentDir : dirEntries) {
-                // add place names of active directories
-                activeDirPlaces.add(currentDir.getLocalPlace().getPlaceName());
+            for (DirectoryEntry entry : dirEntries) {
+                // add place names of active places. getLocalPlace() returns null for any place that failed to start
+                if (entry.getLocalPlace() != null) {
+                    activeDirPlaces.add(entry.getLocalPlace().getPlaceName());
+                }
             }
 
             // remove DirectoryPlace from activeDirPlaces. DirectoryPlace is started up automatically in order to