Merge pull request #13832 from thingsboard/fix/mobile-app

Fix NPE on Firebase app cleanup
2025-08-06 18:57:07 +03:00 · 2025-08-06 18:57:07 +03:00 · e309225f12
commit e309225f12
parent f206983406 e0c2051c6a
1 changed files with 4 additions and 2 deletions
--- a/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java
+++ b/application/src/main/java/org/thingsboard/server/service/notification/provider/DefaultFirebaseService.java
@ -140,8 +140,10 @@ public class DefaultFirebaseService implements FirebaseService {
        }

        public void destroy() {
+            if (app != null) {
                app.delete();
                app = null;
+            }
            messaging = null;
            log.debug("[{}] Destroyed FirebaseContext", key);
        }