aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-04-27 15:27:22 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2015-04-27 15:27:22 +1200
commite02651741e455c8263c412cf9e14ed3e2d9834fe (patch)
tree115d684ccdbbcd61b34cdb66cfe1d3dbfc457605 /src/org/traccar
parentf61e2b5c21c1df4da2c8aa77e4bf33589b4b49a6 (diff)
downloadtraccar-server-e02651741e455c8263c412cf9e14ed3e2d9834fe.tar.gz
traccar-server-e02651741e455c8263c412cf9e14ed3e2d9834fe.tar.bz2
traccar-server-e02651741e455c8263c412cf9e14ed3e2d9834fe.zip
Handle null request in servlet
Diffstat (limited to 'src/org/traccar')
-rw-r--r--src/org/traccar/http/DeviceServlet.java6
-rw-r--r--src/org/traccar/http/MainServlet.java4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/org/traccar/http/DeviceServlet.java b/src/org/traccar/http/DeviceServlet.java
index 4f8f6961d..c994ed266 100644
--- a/src/org/traccar/http/DeviceServlet.java
+++ b/src/org/traccar/http/DeviceServlet.java
@@ -36,7 +36,9 @@ public class DeviceServlet extends HttpServlet {
String command = req.getPathInfo();
- if (command.equals("/get")) {
+ if (command == null) {
+ resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
+ } else if (command.equals("/get")) {
get(req, resp);
} else if (command.equals("/add")) {
add(req, resp);
@@ -44,6 +46,8 @@ public class DeviceServlet extends HttpServlet {
update(req, resp);
} else if (command.equals("/remove")) {
remove(req, resp);
+ } else {
+ resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
}
}
diff --git a/src/org/traccar/http/MainServlet.java b/src/org/traccar/http/MainServlet.java
index a3eae4e55..87769b780 100644
--- a/src/org/traccar/http/MainServlet.java
+++ b/src/org/traccar/http/MainServlet.java
@@ -49,7 +49,9 @@ public class MainServlet extends HttpServlet {
String command = req.getPathInfo();
- if (command.equals("/async")) {
+ if (command == null) {
+ resp.sendError(HttpServletResponse.SC_BAD_REQUEST);
+ } else if (command.equals("/async")) {
async(req.startAsync());
} else if (command.equals("/login")) {
login(req, resp);