You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2022/04/06 10:02:25 UTC
[rocketmq-mqtt] branch main updated: fix #53 for npe (#54)
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-mqtt.git
The following commit(s) were added to refs/heads/main by this push:
new 0177b54 fix #53 for npe (#54)
0177b54 is described below
commit 0177b547fdc54588e0893791f417747fa1e5743a
Author: tianliuliu <64...@qq.com>
AuthorDate: Wed Apr 6 18:02:21 2022 +0800
fix #53 for npe (#54)
---
.../org/apache/rocketmq/mqtt/cs/channel/ChannelInfo.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/channel/ChannelInfo.java b/mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/channel/ChannelInfo.java
index 4e600af..9521f32 100644
--- a/mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/channel/ChannelInfo.java
+++ b/mqtt-cs/src/main/java/org/apache/rocketmq/mqtt/cs/channel/ChannelInfo.java
@@ -93,7 +93,11 @@ public class ChannelInfo {
if (!getInfo(channel).containsKey(CHANNEL_EXT_CHANGE_KEY)) {
getInfo(channel).put(CHANNEL_EXT_CHANGE_KEY, false);
}
- return (boolean) getInfo(channel).get(CHANNEL_EXT_CHANGE_KEY);
+ Object obj = getInfo(channel).get(CHANNEL_EXT_CHANGE_KEY);
+ if (obj == null) {
+ return false;
+ }
+ return (boolean)obj;
}
public static String getId(Channel channel) {
@@ -110,7 +114,11 @@ public class ChannelInfo {
if (!getInfo(channel).containsKey(CHANNEL_CLEAN_SESSION_KEY)) {
getInfo(channel).put(CHANNEL_CLEAN_SESSION_KEY, true);
}
- return (Boolean) getInfo(channel).get(CHANNEL_CLEAN_SESSION_KEY);
+ Object obj = getInfo(channel).get(CHANNEL_CLEAN_SESSION_KEY);
+ if (obj == null) {
+ return true;
+ }
+ return (Boolean)obj;
}
public static void setCleanSessionFlag(Channel channel, Boolean cleanSessionFalg) {