aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/http
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-04-27 17:30:57 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-04-27 17:30:57 +1200
commitac88c14d7982ef7571ae6f09ec50267ea4f1062a (patch)
treeba1eed800ba1b18d4017d923ad7e843eabeabc24 /src/org/traccar/http
parente02651741e455c8263c412cf9e14ed3e2d9834fe (diff)
downloadtraccar-server-ac88c14d7982ef7571ae6f09ec50267ea4f1062a.tar.gz
traccar-server-ac88c14d7982ef7571ae6f09ec50267ea4f1062a.tar.bz2
traccar-server-ac88c14d7982ef7571ae6f09ec50267ea4f1062a.zip
Reuse constants in servlets
Diffstat (limited to 'src/org/traccar/http')
-rw-r--r--src/org/traccar/http/DeviceServlet.java6
-rw-r--r--src/org/traccar/http/MainServlet.java4
2 files changed, 3 insertions, 7 deletions
diff --git a/src/org/traccar/http/DeviceServlet.java b/src/org/traccar/http/DeviceServlet.java
index c994ed266..260083e0e 100644
--- a/src/org/traccar/http/DeviceServlet.java
+++ b/src/org/traccar/http/DeviceServlet.java
@@ -26,10 +26,6 @@ import javax.servlet.http.HttpServletResponse;
import org.traccar.Context;
public class DeviceServlet extends HttpServlet {
-
- private static final long ASYNC_TIMEOUT = 120000;
-
- private static final String USER_ID = "userId";
@Override
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
@@ -53,7 +49,7 @@ public class DeviceServlet extends HttpServlet {
private void get(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- long userId = (Long) req.getSession().getAttribute(USER_ID);
+ long userId = (Long) req.getSession().getAttribute(MainServlet.USER_ID);
JsonObjectBuilder result = Json.createObjectBuilder();
diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/http/MainServlet.java
index 87769b780..62345489e 100644
--- a/src/org/traccar/http/MainServlet.java
+++ b/src/org/traccar/http/MainServlet.java
@@ -40,9 +40,9 @@ import org.traccar.model.Position;
public class MainServlet extends HttpServlet {
- private static final long ASYNC_TIMEOUT = 120000;
+ public static final String USER_ID = "userId";
- private static final String USER_ID = "userId";
+ private static final long ASYNC_TIMEOUT = 120000;
@Override
protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {