From 4b4b2f97d4f68ccedc18ba896aebd878e29e36bd Mon Sep 17 00:00:00 2001
From: Vishnu Gp <vishnu@appsmith.com>
Date: Thu, 29 Sep 2022 00:33:54 +0530
Subject: [PATCH] fix: Fixed NPE issue with analytics event on authentication
 method configuration (#17112)

---
 .../java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
index e1ebba5977..75dd6d2c6b 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/solutions/ce/EnvManagerCEImpl.java
@@ -381,7 +381,7 @@ public class EnvManagerCEImpl implements EnvManagerCE {
      */
     public void setAnalyticsEventAction(Map<String, Object> properties, String newVariable, String originalVariable, String authEnv) {
         // Authentication configuration added
-        if (!newVariable.isEmpty() && originalVariable.isEmpty()) {
+        if (!newVariable.isEmpty() && (originalVariable == null || originalVariable.isEmpty())) {
             properties.put("action", "Added");
         }
         // Authentication configuration removed