Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
0f0796d2
Commit
0f0796d2
authored
Apr 25, 2017
by
Guus der Kinderen
Committed by
akrherz
Apr 25, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
OF-1321: Proper null-check to avoid stacktrace with stale session.
parent
436643cb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
1 deletion
+13
-1
WebManager.java
src/java/org/jivesoftware/util/WebManager.java
+13
-1
No files found.
src/java/org/jivesoftware/util/WebManager.java
View file @
0f0796d2
...
...
@@ -144,7 +144,19 @@ public class WebManager extends WebBean {
public
User
getUser
()
{
User
pageUser
=
null
;
try
{
pageUser
=
getUserManager
().
getUser
(
getAuthToken
().
getUsername
());
final
AuthToken
authToken
=
getAuthToken
();
if
(
authToken
==
null
)
{
Log
.
debug
(
"Unable to get user: no auth token on session."
);
return
null
;
}
final
String
username
=
authToken
.
getUsername
();
if
(
username
==
null
||
username
.
isEmpty
())
{
Log
.
debug
(
"Unable to get user: no username in auth token on session."
);
return
null
;
}
pageUser
=
getUserManager
().
getUser
(
username
);
}
catch
(
Exception
ex
)
{
Log
.
debug
(
"Unexpected exception (which is ignored) while trying to obtain user."
,
ex
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment