From fba12a2b809c70d4374952fc39c8a22f5710e960 Mon Sep 17 00:00:00 2001 From: apathy Date: Sat, 7 Jan 2017 00:58:43 -0600 Subject: [PATCH] Fix CHECK_NOTNULL usage --- src/stationchat/protocol/Protocol.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/stationchat/protocol/Protocol.cpp b/src/stationchat/protocol/Protocol.cpp index ef64e81..8fa6188 100644 --- a/src/stationchat/protocol/Protocol.cpp +++ b/src/stationchat/protocol/Protocol.cpp @@ -272,7 +272,9 @@ FailoverReLoginAvatar::FailoverReLoginAvatar( request.attributes, request.loginLocation); } - avatarService_->LoginAvatar(CHECK_NOTNULL(avatar)); + CHECK_NOTNULL(avatar); + + avatarService_->LoginAvatar(avatar); if (avatar->GetName().compare(u"SYSTEM") == 0) { client->GetNode()->RegisterClientAddress(avatar->GetAddress(), client); @@ -437,7 +439,9 @@ LoginAvatar::LoginAvatar(GatewayClient* client, const RequestType& request, Resp request.loginAttributes, request.loginLocation); } - avatarService_->LoginAvatar(CHECK_NOTNULL(avatar)); + CHECK_NOTNULL(avatar); + + avatarService_->LoginAvatar(avatar); if (avatar->GetName().compare(u"SYSTEM") == 0) { client->GetNode()->RegisterClientAddress(avatar->GetAddress(), client);