Merge branch 'master_prb_gn' into master_test_gn

back_recharge
jiahuiwen 2021-10-20 16:06:37 +08:00
commit d435e81ffc
2 changed files with 10 additions and 1 deletions

View File

@ -193,6 +193,10 @@ public class LjsdMongoTemplate implements MongoUpdateImp {
int serverIdByUid = AreaManager.getInstance().getServerIdByUid(Integer.parseInt(id), GameApplication.serverId);
otherMonogTemplate = MongoUtil.getInstence().getMonogTemplate(serverIdByUid);
}
if (otherMonogTemplate == null) {
LOGGER.info("updateMongoData id={} otherMonogTemplate == null ", id);
continue;
}
for (MongoUpdateCache.UpdateRequest request : entry.getValue().values()) {
if (request.opCode == 2) {

View File

@ -810,7 +810,12 @@ public class CBean2Proto {
public static CommonProto.Friend getFriendInfo(int friendId, FriendManager friendManager) throws Exception {
User user = UserManager.getUser(friendId);
User user = null;
try {
user = UserManager.getUser(friendId);
} catch (Exception e) {
LOGGER.info("getFriendInfo user == null friendId={} e={}", friendId, e.toString());
}
if (user == null) {
return null;
}