Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小五666\n哈哈
Rocketmq
提交
03c1f11d
R
Rocketmq
项目概览
小五666\n哈哈
/
Rocketmq
与 Fork 源项目一致
Fork自
Apache RocketMQ / Rocketmq
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rocketmq
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
03c1f11d
编写于
11月 01, 2020
作者:
A
Alvin
提交者:
GitHub
11月 01, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[ISSUE #2378] FIx `NullPointerException` when Consumer shutdown in the ClientRemotingProcessor.
上级
f5a119f1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
0 deletion
+32
-0
client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
...apache/rocketmq/client/impl/factory/MQClientInstance.java
+3
-0
client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java
...he/rocketmq/client/impl/factory/MQClientInstanceTest.java
+29
-0
未找到文件。
client/src/main/java/org/apache/rocketmq/client/impl/factory/MQClientInstance.java
浏览文件 @
03c1f11d
...
@@ -1214,6 +1214,9 @@ public class MQClientInstance {
...
@@ -1214,6 +1214,9 @@ public class MQClientInstance {
public
ConsumerRunningInfo
consumerRunningInfo
(
final
String
consumerGroup
)
{
public
ConsumerRunningInfo
consumerRunningInfo
(
final
String
consumerGroup
)
{
MQConsumerInner
mqConsumerInner
=
this
.
consumerTable
.
get
(
consumerGroup
);
MQConsumerInner
mqConsumerInner
=
this
.
consumerTable
.
get
(
consumerGroup
);
if
(
mqConsumerInner
==
null
)
{
return
null
;
}
ConsumerRunningInfo
consumerRunningInfo
=
mqConsumerInner
.
consumerRunningInfo
();
ConsumerRunningInfo
consumerRunningInfo
=
mqConsumerInner
.
consumerRunningInfo
();
...
...
client/src/test/java/org/apache/rocketmq/client/impl/factory/MQClientInstanceTest.java
浏览文件 @
03c1f11d
...
@@ -19,6 +19,7 @@ package org.apache.rocketmq.client.impl.factory;
...
@@ -19,6 +19,7 @@ package org.apache.rocketmq.client.impl.factory;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Properties
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ConcurrentHashMap
;
import
java.util.concurrent.ConcurrentMap
;
import
java.util.concurrent.ConcurrentMap
;
import
org.apache.rocketmq.client.ClientConfig
;
import
org.apache.rocketmq.client.ClientConfig
;
...
@@ -29,6 +30,8 @@ import org.apache.rocketmq.client.impl.MQClientManager;
...
@@ -29,6 +30,8 @@ import org.apache.rocketmq.client.impl.MQClientManager;
import
org.apache.rocketmq.client.impl.consumer.MQConsumerInner
;
import
org.apache.rocketmq.client.impl.consumer.MQConsumerInner
;
import
org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl
;
import
org.apache.rocketmq.client.impl.producer.DefaultMQProducerImpl
;
import
org.apache.rocketmq.client.impl.producer.TopicPublishInfo
;
import
org.apache.rocketmq.client.impl.producer.TopicPublishInfo
;
import
org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo
;
import
org.apache.rocketmq.common.protocol.heartbeat.ConsumeType
;
import
org.apache.rocketmq.common.protocol.route.BrokerData
;
import
org.apache.rocketmq.common.protocol.route.BrokerData
;
import
org.apache.rocketmq.common.protocol.route.QueueData
;
import
org.apache.rocketmq.common.protocol.route.QueueData
;
import
org.apache.rocketmq.common.protocol.route.TopicRouteData
;
import
org.apache.rocketmq.common.protocol.route.TopicRouteData
;
...
@@ -41,6 +44,7 @@ import org.mockito.junit.MockitoJUnitRunner;
...
@@ -41,6 +44,7 @@ import org.mockito.junit.MockitoJUnitRunner;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
mock
;
import
static
org
.
mockito
.
Mockito
.
when
;
@RunWith
(
MockitoJUnitRunner
.
class
)
@RunWith
(
MockitoJUnitRunner
.
class
)
public
class
MQClientInstanceTest
{
public
class
MQClientInstanceTest
{
...
@@ -139,6 +143,31 @@ public class MQClientInstanceTest {
...
@@ -139,6 +143,31 @@ public class MQClientInstanceTest {
assertThat
(
flag
).
isTrue
();
assertThat
(
flag
).
isTrue
();
}
}
@Test
public
void
testConsumerRunningInfoWhenConsumersIsEmptyOrNot
()
throws
RemotingException
,
InterruptedException
,
MQBrokerException
{
MQConsumerInner
mockConsumerInner
=
mock
(
MQConsumerInner
.
class
);
ConsumerRunningInfo
mockConsumerRunningInfo
=
mock
(
ConsumerRunningInfo
.
class
);
when
(
mockConsumerInner
.
consumerRunningInfo
()).
thenReturn
(
mockConsumerRunningInfo
);
when
(
mockConsumerInner
.
consumeType
()).
thenReturn
(
ConsumeType
.
CONSUME_PASSIVELY
);
Properties
properties
=
new
Properties
();
when
(
mockConsumerRunningInfo
.
getProperties
()).
thenReturn
(
properties
);
mqClientInstance
.
unregisterConsumer
(
group
);
ConsumerRunningInfo
runningInfo
=
mqClientInstance
.
consumerRunningInfo
(
group
);
assertThat
(
runningInfo
).
isNull
();
boolean
flag
=
mqClientInstance
.
registerConsumer
(
group
,
mockConsumerInner
);
assertThat
(
flag
).
isTrue
();
runningInfo
=
mqClientInstance
.
consumerRunningInfo
(
group
);
assertThat
(
runningInfo
).
isNotNull
();
assertThat
(
mockConsumerInner
.
consumerRunningInfo
().
getProperties
().
get
(
ConsumerRunningInfo
.
PROP_CONSUME_TYPE
));
mqClientInstance
.
unregisterConsumer
(
group
);
flag
=
mqClientInstance
.
registerConsumer
(
group
,
mock
(
MQConsumerInner
.
class
));
assertThat
(
flag
).
isTrue
();
}
@Test
@Test
public
void
testRegisterAdminExt
()
{
public
void
testRegisterAdminExt
()
{
boolean
flag
=
mqClientInstance
.
registerAdminExt
(
group
,
mock
(
MQAdminExtInner
.
class
));
boolean
flag
=
mqClientInstance
.
registerAdminExt
(
group
,
mock
(
MQAdminExtInner
.
class
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录