aboutsummaryrefslogtreecommitdiff
path: root/src/org
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2013-01-16 19:35:45 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2013-01-16 19:35:45 +1300
commit3359ed25df8676aee9af4f071eeedc084db330eb (patch)
treef5f80b2293bb39b2c5d0d09f9b49de0a3c88550d /src/org
parentb8f5f6761fa72cb41d67a1c6f649231da291fe0e (diff)
downloadtrackermap-server-3359ed25df8676aee9af4f071eeedc084db330eb.tar.gz
trackermap-server-3359ed25df8676aee9af4f071eeedc084db330eb.tar.bz2
trackermap-server-3359ed25df8676aee9af4f071eeedc084db330eb.zip
Fix test cases
Diffstat (limited to 'src/org')
-rw-r--r--src/org/traccar/BaseProtocolDecoder.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/org/traccar/BaseProtocolDecoder.java b/src/org/traccar/BaseProtocolDecoder.java
index 630fe9a69..657e56258 100644
--- a/src/org/traccar/BaseProtocolDecoder.java
+++ b/src/org/traccar/BaseProtocolDecoder.java
@@ -46,8 +46,10 @@ public abstract class BaseProtocolDecoder extends OneToOneDecoder {
}
public BaseProtocolDecoder(ServerManager serverManager) {
- this.serverManager = serverManager;
- dataManager = serverManager.getDataManager();
+ if (serverManager != null) {
+ this.serverManager = serverManager;
+ dataManager = serverManager.getDataManager();
+ }
}
}