Merge pull request #2984 from ControlSystemStudio/credentials_fix

Fix NPE if save&restore not yet launched
ControlSystemStudio · Mar 25, 2024 · c5f403f · c5f403f
2 parents 1ee2a6d + ef8564a
commit c5f403f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.../org/phoebus/applications/saveandrestore/authentication/SecureStoreChangeHandlerImpl.java b/.../org/phoebus/applications/saveandrestore/authentication/SecureStoreChangeHandlerImpl.java
@@ -42,6 +42,10 @@ public void secureStoreChanged(List<ScopedAuthenticationToken> validTokens) {
         if (appDescriptor != null && appDescriptor instanceof SaveAndRestoreApplication) {
             SaveAndRestoreApplication saveAndRestoreApplication = (SaveAndRestoreApplication) appDescriptor;
             SaveAndRestoreInstance saveAndRestoreInstance = (SaveAndRestoreInstance) saveAndRestoreApplication.getInstance();
+            // Save&restore app may not be launched (yet)
+            if(saveAndRestoreInstance == null){
+                return;
+            }
             saveAndRestoreInstance.secureStoreChanged(validTokens);
         }
     }