aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/notification
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-09-07 11:33:22 +0500
committerAbyss777 <abyss@fox5.ru>2017-09-07 11:33:22 +0500
commit9ebd2a934a5ca3a61863f839733bff321ba30296 (patch)
tree265352fda7b704c240018f57e53c6626f166470d /src/org/traccar/notification
parentf0578c7b5f8737e019a9cf05935d2caaa940f0ca (diff)
downloadtrackermap-server-9ebd2a934a5ca3a61863f839733bff321ba30296.tar.gz
trackermap-server-9ebd2a934a5ca3a61863f839733bff321ba30296.tar.bz2
trackermap-server-9ebd2a934a5ca3a61863f839733bff321ba30296.zip
Handle correct and incorrect attribute types
Diffstat (limited to 'src/org/traccar/notification')
-rw-r--r--src/org/traccar/notification/NotificationMail.java2
-rw-r--r--src/org/traccar/notification/PropertiesProvider.java10
2 files changed, 11 insertions, 1 deletions
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java
index d7f3bf64c..fc70a6115 100644
--- a/src/org/traccar/notification/NotificationMail.java
+++ b/src/org/traccar/notification/NotificationMail.java
@@ -43,7 +43,7 @@ public final class NotificationMail {
if (host != null) {
properties.put("mail.transport.protocol", provider.getString("mail.transport.protocol", "smtp"));
properties.put("mail.smtp.host", host);
- properties.put("mail.smtp.port", provider.getString("mail.smtp.port", "25"));
+ properties.put("mail.smtp.port", String.valueOf(provider.getInteger("mail.smtp.port", 25)));
String starttlsEnable = provider.getString("mail.smtp.starttls.enable");
if (starttlsEnable != null) {
diff --git a/src/org/traccar/notification/PropertiesProvider.java b/src/org/traccar/notification/PropertiesProvider.java
index 2fea901af..1a4104d2b 100644
--- a/src/org/traccar/notification/PropertiesProvider.java
+++ b/src/org/traccar/notification/PropertiesProvider.java
@@ -48,4 +48,14 @@ public class PropertiesProvider {
return value;
}
+ public int getInteger(String key, int defaultValue) {
+ if (config != null) {
+ return config.getInteger(key, defaultValue);
+ } else if (extendedModel.getAttributes().containsKey(key)) {
+ return Integer.parseInt(extendedModel.getAttributes().get(key).toString());
+ } else {
+ return defaultValue;
+ }
+ }
+
}