From ac88c14d7982ef7571ae6f09ec50267ea4f1062a Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Mon, 27 Apr 2015 17:30:57 +1200 Subject: Reuse constants in servlets --- src/org/traccar/http/DeviceServlet.java | 6 +----- src/org/traccar/http/MainServlet.java | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/org/traccar') 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 { -- cgit v1.2.3