Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Switch OR_EMAIL_X_HEADERS to use ':' for header value separator

Rich Turner46c8194d48f2
diff --git a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
index e5e81b5ad..f486a4970 100644
--- a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
@@ -79,10 +79,10 @@ public class EmailNotificationHandler implements NotificationHandler {
String headersStr = container.getConfig().getOrDefault(OR_EMAIL_X_HEADERS, null);
if (!TextUtil.isNullOrEmpty(headersStr)) {
headers = Arrays.stream(headersStr.split("\\R"))
- .map(s -> s.split("=", 2))
+ .map(s -> s.split(":", 2))
.collect(Collectors.toMap(
- arr -> arr[0],
- arr -> arr[1]
+ arr -> arr[0].trim(),
+ arr -> arr.length == 2 ? arr[1].trim() : ""
));
}