From 3359ed25df8676aee9af4f071eeedc084db330eb Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Wed, 16 Jan 2013 19:35:45 +1300
Subject: Fix test cases

---
 src/org/traccar/BaseProtocolDecoder.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/BaseProtocolDecoder.java')

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();
+        }
     }
 
 }
-- 
cgit v1.2.3