diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java index cc5bfaa3e..9cd2fedb4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java @@ -113,9 +113,10 @@ public class GetPlayerInfoHandler extends BaseHandler{ List goodsTypeDurations = new ArrayList<>(3); for(Map.Entry entry : goodsTypeDurationMap.entrySet()){ Integer goodsId = entry.getKey(); - SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId); Integer goodsEndTime = entry.getValue(); - goodsTypeDurations.add(CommonProto.GoodsTypeDuration.newBuilder().setGoodsType(sRechargeCommodityConfig.getType()).setEndTime(goodsEndTime).build()); +// SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(goodsId); + + goodsTypeDurations.add(CommonProto.GoodsTypeDuration.newBuilder().setGoodsType(goodsId).setEndTime(goodsEndTime).build()); } //问卷状态 int questState =-1; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java index 858705aaa..836a684a4 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/core/ExchangeCdkHandler.java @@ -68,10 +68,10 @@ public class ExchangeCdkHandler extends BaseHandler sessionMap = OnlineUserManager.sessionMap; + Map sessionMap = new ConcurrentHashMap<>(OnlineUserManager.sessionMap); if(sessionMap == null){ return; } long now = TimeUtils.now(); Set removeIds = new HashSet<>(); for(ISession session : sessionMap.values()){ + if(session == null){ + continue; + } if(!session.getChannel().isClosed()&&session.getChannel().isConnected()){