From e0c2051c6a459d83ec222a5db17dfd887b583a99 Mon Sep 17 00:00:00 2001
From: VIacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Wed, 6 Aug 2025 18:54:22 +0300
Subject: [PATCH] Fix NPE on Firebase app cleanup

---
 .../notification/provider/DefaultFirebaseService.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 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
index d1307fcd5d..8056b9fde2 100644
--- 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() {
-            app.delete();
-            app = null;
+            if (app != null) {
+                app.delete();
+                app = null;
+            }
             messaging = null;
             log.debug("[{}] Destroyed FirebaseContext", key);
         }