From 2a2b55ceafafde8709a58a7f728ba32b14930625 Mon Sep 17 00:00:00 2001
From: Shrikant Sharat Kandula <shrikant@appsmith.com>
Date: Thu, 18 Feb 2021 09:10:15 +0530
Subject: [PATCH] Fix NPE on plugin specified templates (#3084)

---
 .../server/services/NewActionServiceImpl.java       | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
index 16fa7047e2..52c6206e5c 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/NewActionServiceImpl.java
@@ -58,6 +58,7 @@ import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -683,9 +684,11 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                     } else if (pluginType == PluginType.DB) {
                         requestData.putAll(Map.of(
                                 "query", ObjectUtils.defaultIfNull(actionConfiguration.getBody(), ""),
-                                "properties", actionConfiguration.getPluginSpecifiedTemplates()
-                                        .stream()
-                                        .collect(Collectors.toMap(Property::getKey, Property::getValue))
+                                "properties", actionConfiguration.getPluginSpecifiedTemplates() == null
+                                        ? Collections.emptyMap()
+                                        : actionConfiguration.getPluginSpecifiedTemplates()
+                                            .stream()
+                                            .collect(Collectors.toMap(Property::getKey, Property::getValue))
                         ));
                     }
 
@@ -714,6 +717,10 @@ public class NewActionServiceImpl extends BaseService<NewActionRepository, NewAc
                     analyticsService.sendEvent(AnalyticsEvents.EXECUTE_ACTION.getEventName(), user.getUsername(), data);
                     return user;
                 })
+                .onErrorResume(error -> {
+                    log.warn("Error sending action execution data point", error);
+                    return Mono.empty();
+                })
                 .then();
     }