From a92dc851b8c8cd9d2506adecd21f708a8313ce17 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 21 Jul 2015 16:09:44 +1200
Subject: Fix issue with web data handler

---
 pom.xml                             | 13 ++++++-------
 src/org/traccar/WebDataHandler.java | 12 ++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad56c0f49..125a7eeb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,13 +49,12 @@
         <dependency>
             <groupId>com.ning</groupId>
             <artifactId>async-http-client</artifactId>
-            <version>1.9.29</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>slf4j-api</artifactId>
-                    <groupId>org.slf4j</groupId>
-                </exclusion>
-            </exclusions>
+            <version>1.9.30</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.12</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish</groupId>
diff --git a/src/org/traccar/WebDataHandler.java b/src/org/traccar/WebDataHandler.java
index fce73c816..5e3626022 100644
--- a/src/org/traccar/WebDataHandler.java
+++ b/src/org/traccar/WebDataHandler.java
@@ -63,12 +63,12 @@ public class WebDataHandler extends BaseDataHandler {
         Device device = Context.getIdentityManager().getDeviceById(position.getDeviceId());
         
         String request = url.
-                replaceAll("\\{uniqueId}", device.getUniqueId()).
-                replaceAll("\\{deviceId}", String.valueOf(device.getId())).
-                replaceAll("\\{fixTime}", String.valueOf(position.getFixTime().getTime())).
-                replaceAll("\\{latitude}", String.valueOf(position.getLatitude())).
-                replaceAll("\\{longitude}", String.valueOf(position.getLongitude())).
-                replaceAll("\\{gprmc}", formatSentence(position));
+                replace("{uniqueId}", device.getUniqueId()).
+                replace("{deviceId}", String.valueOf(device.getId())).
+                replace("{fixTime}", String.valueOf(position.getFixTime().getTime())).
+                replace("{latitude}", String.valueOf(position.getLatitude())).
+                replace("{longitude}", String.valueOf(position.getLongitude())).
+                replace("{gprmc}", formatSentence(position));
         
         AsyncHttpClient asyncHttpClient = new AsyncHttpClient();
         asyncHttpClient.prepareGet(request).execute();
-- 
cgit v1.2.3