From 10fff38e197140d9966ca81185dc5e8f25983ffb Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sat, 5 Mar 2016 11:15:24 +1300
Subject: Handle some async socket exceptions

---
 src/org/traccar/api/AsyncSocketServlet.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/org/traccar/api/AsyncSocketServlet.java')

diff --git a/src/org/traccar/api/AsyncSocketServlet.java b/src/org/traccar/api/AsyncSocketServlet.java
index edfa8939b..ef6cef732 100644
--- a/src/org/traccar/api/AsyncSocketServlet.java
+++ b/src/org/traccar/api/AsyncSocketServlet.java
@@ -33,8 +33,12 @@ public class AsyncSocketServlet extends WebSocketServlet {
         factory.setCreator(new WebSocketCreator() {
             @Override
             public Object createWebSocket(ServletUpgradeRequest req, ServletUpgradeResponse resp) {
-                long userId = (Long) req.getSession().getAttribute(SessionResource.USER_ID_KEY);
-                return new AsyncSocket(userId);
+                if (req.getSession() != null) {
+                    long userId = (Long) req.getSession().getAttribute(SessionResource.USER_ID_KEY);
+                    return new AsyncSocket(userId);
+                } else {
+                    return null;
+                }
             }
         });
     }
-- 
cgit v1.2.3