diff options
author | Abyss777 <abyss@fox5.ru> | 2017-01-16 13:51:40 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-01-16 13:51:40 +0500 |
commit | b5eb48cbba215ca55c1a5e5ae5fae5b375243247 (patch) | |
tree | 64a25006deb6635853c0cc727db201f088566347 /test/org/traccar/ProtocolTest.java | |
parent | cffbce4b3bc5ef817c4063a74f148a2a5986d58a (diff) | |
parent | 00caa503748a1dad3349bfb8444ef766efd60633 (diff) | |
download | traccar-server-b5eb48cbba215ca55c1a5e5ae5fae5b375243247.tar.gz traccar-server-b5eb48cbba215ca55c1a5e5ae5fae5b375243247.tar.bz2 traccar-server-b5eb48cbba215ca55c1a5e5ae5fae5b375243247.zip |
Merge remote-tracking branch 'upstream/master' into manager
# Conflicts:
# setup/default.xml
Diffstat (limited to 'test/org/traccar/ProtocolTest.java')
-rw-r--r-- | test/org/traccar/ProtocolTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java index 20e033e3b..955e0b788 100644 --- a/test/org/traccar/ProtocolTest.java +++ b/test/org/traccar/ProtocolTest.java @@ -178,7 +178,7 @@ public class ProtocolTest extends BaseTest { Assert.assertFalse("no attributes", attributes.isEmpty()); } - if (position.getNetwork() != null) { + if (position.getNetwork() != null && position.getNetwork().getCellTowers() != null) { for (CellTower cellTower : position.getNetwork().getCellTowers()) { checkInteger(cellTower.getMobileCountryCode(), 0, 999); checkInteger(cellTower.getMobileNetworkCode(), 0, 999); |