From ca7c565f2f10fc89f3edb70dd1cee59fb10152e8 Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Wed, 20 Oct 2021 11:07:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=8F=8B=20null=20=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/friend/FriendLogic.java | 12 ++++++++++++ .../main/java/com/ljsd/jieling/util/CBean2Proto.java | 3 +++ 2 files changed, 15 insertions(+) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java index d69634b7f..9dcd0d624 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java @@ -78,6 +78,9 @@ public class FriendLogic { List friendList = new CopyOnWriteArrayList<>(); for (Integer friendId :friends){ CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager); + if (friend == null) { + continue; + } friendList.add(friend); } PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse @@ -97,6 +100,9 @@ public class FriendLogic { List friendList = new CopyOnWriteArrayList<>(); for (Integer friendId :blackFriends){ CommonProto.Friend friend = CBean2Proto.getFriendInfo(friendId,friendManager); + if (friend == null) { + continue; + } friendList.add(friend); } PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse @@ -172,6 +178,9 @@ public class FriendLogic { for (Integer commondUid : recommandFriends){ CommonProto.Friend friend = CBean2Proto.getFriendInfo(commondUid,friendManager); + if (friend == null) { + continue; + } friendList.add(friend); } PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse @@ -212,6 +221,9 @@ public class FriendLogic { List friendList = new CopyOnWriteArrayList<>(); for (Integer applyFriendId :applyFriends){ CommonProto.Friend friend = CBean2Proto.getFriendInfo(applyFriendId,friendManager); + if (friend == null) { + continue; + } friendList.add(friend); } PlayerInfoProto.GetFriendInfoResponse getFriendInfoResponse = PlayerInfoProto.GetFriendInfoResponse diff --git a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java index b1c29280e..226d9e09a 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/util/CBean2Proto.java @@ -811,6 +811,9 @@ public class CBean2Proto { public static CommonProto.Friend getFriendInfo(int friendId, FriendManager friendManager) throws Exception { User user = UserManager.getUser(friendId); + if (user == null) { + return null; + } PlayerManager playerInfoManager = user.getPlayerInfoManager(); int isGrive = 0; int haveReward = 0;