From 640a3dc239a2f5fb8ad03ee6792a166d48c67c7d Mon Sep 17 00:00:00 2001 From: Kris McQueen Date: Thu, 28 Oct 2010 17:35:21 -0700 Subject: [PATCH] bug 6818: if the userAccount is null, the user is either removed or does not exist. Since we can't log them out in those cases, just skip saving the logout event (and hence avoid the NPE). status 6818: resolved fixed --- server/src/com/cloud/server/ManagementServerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index cb3c56ec646..adf6fc98160 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -4535,7 +4535,9 @@ public class ManagementServerImpl implements ManagementServer { @Override public void logoutUser(Long userId) { UserAccount userAcct = _userAccountDao.findById(userId); - EventUtils.saveEvent(userId, userAcct.getAccountId(), EventTypes.EVENT_USER_LOGOUT, "user has logged out"); + if (userAcct != null) { + EventUtils.saveEvent(userId, userAcct.getAccountId(), EventTypes.EVENT_USER_LOGOUT, "user has logged out"); + } // else log some kind of error event? This likely means the user doesn't exist, or has been deleted... } @Override