diff options
| author | Ivan Muratov <binakot@gmail.com> | 2017-10-24 14:52:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-24 14:52:48 +0300 |
| commit | db02157dbb29539dda4b51a5e8b317293cfc536c (patch) | |
| tree | b974f082172406e16a92cb9da8136ef856f571a5 /src/org/traccar/api/resource/SessionResource.java | |
| parent | 09d3cf2b5416327700ad22b652cf4a0dca09aaf2 (diff) | |
| parent | 96e15853b9c28bd31295ca2c014e226e4a50aaa1 (diff) | |
| download | traccar-server-db02157dbb29539dda4b51a5e8b317293cfc536c.tar.gz traccar-server-db02157dbb29539dda4b51a5e8b317293cfc536c.tar.bz2 traccar-server-db02157dbb29539dda4b51a5e8b317293cfc536c.zip | |
Merge branch 'master' into master
Diffstat (limited to 'src/org/traccar/api/resource/SessionResource.java')
| -rw-r--r-- | src/org/traccar/api/resource/SessionResource.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/org/traccar/api/resource/SessionResource.java b/src/org/traccar/api/resource/SessionResource.java index acdbb7c87..fa2a14c6f 100644 --- a/src/org/traccar/api/resource/SessionResource.java +++ b/src/org/traccar/api/resource/SessionResource.java @@ -80,7 +80,7 @@ public class SessionResource extends BaseResource { request.getSession().setAttribute(USER_ID_KEY, userId); } } else if (token != null) { - User user = Context.getPermissionsManager().getUserByToken(token); + User user = Context.getUsersManager().getUserByToken(token); if (user != null) { userId = user.getId(); request.getSession().setAttribute(USER_ID_KEY, userId); |