aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavriel Fleischer <flocsy@gmail.com>2019-01-07 22:24:53 +0200
committerGavriel Fleischer <flocsy@gmail.com>2019-01-07 22:24:53 +0200
commitc0316e4a968ea73002954118cafdd958f354370f (patch)
tree1263c3657ba780b4369e862cf4b3bd48f46893b2
parentac9ca0605726344f8a8242198102ccdd9a52635e (diff)
downloadtraccar-server-c0316e4a968ea73002954118cafdd958f354370f.tar.gz
traccar-server-c0316e4a968ea73002954118cafdd958f354370f.tar.bz2
traccar-server-c0316e4a968ea73002954118cafdd958f354370f.zip
added getInteger that can return null
-rw-r--r--src/org/traccar/MainEventHandler.java2
-rw-r--r--src/org/traccar/model/ExtendedModel.java8
2 files changed, 7 insertions, 3 deletions
diff --git a/src/org/traccar/MainEventHandler.java b/src/org/traccar/MainEventHandler.java
index 3a8e36146..a3bbb8fd6 100644
--- a/src/org/traccar/MainEventHandler.java
+++ b/src/org/traccar/MainEventHandler.java
@@ -77,7 +77,7 @@ public class MainEventHandler extends ChannelInboundHandlerAdapter {
if (!position.getValid()) {
s.append(", invalid");
}
- Object batteryLevel = position.getInteger(Position.KEY_BATTERY_LEVEL);
+ Object batteryLevel = position.getInteger(Position.KEY_BATTERY_LEVEL, null);
if (batteryLevel != null) {
s.append(", battery: ").append(batteryLevel).append('%');
}
diff --git a/src/org/traccar/model/ExtendedModel.java b/src/org/traccar/model/ExtendedModel.java
index 8353d0e66..8271e41cc 100644
--- a/src/org/traccar/model/ExtendedModel.java
+++ b/src/org/traccar/model/ExtendedModel.java
@@ -108,14 +108,18 @@ public class ExtendedModel extends BaseModel {
}
}
- public int getInteger(String key) {
+ public Integer getInteger(String key, Integer defaultValue) {
if (attributes.containsKey(key)) {
return ((Number) attributes.get(key)).intValue();
} else {
- return 0;
+ return defaultValue;
}
}
+ public int getInteger(String key) {
+ return getInteger(key, 0);
+ }
+
public long getLong(String key) {
if (attributes.containsKey(key)) {
return ((Number) attributes.get(key)).longValue();