Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
_Walt
Rocketmq
提交
85467dfd
R
Rocketmq
项目概览
_Walt
/
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,发现更多精彩内容 >>
提交
85467dfd
编写于
1月 09, 2017
作者:
Q
qinliujie
提交者:
yukon
1月 09, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix-35 [ROCKETMQ-35] Reslove underlying NPE in ConsumeRequest, closes apache/incubator-rocketmq#32
上级
9d76ea92
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
2 deletion
+10
-2
client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
...ient/impl/consumer/ConsumeMessageConcurrentlyService.java
+5
-1
client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
...mq/client/impl/consumer/ConsumeMessageOrderlyService.java
+5
-1
未找到文件。
client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java
浏览文件 @
85467dfd
...
...
@@ -439,7 +439,11 @@ public class ConsumeMessageConcurrentlyService implements ConsumeMessageService
}
else
if
(
ConsumeConcurrentlyStatus
.
CONSUME_SUCCESS
==
status
)
{
returnType
=
ConsumeReturnType
.
SUCCESS
;
}
consumeMessageContext
.
getProps
().
put
(
MixAll
.
CONSUME_CONTEXT_TYPE
,
returnType
.
name
());
if
(
ConsumeMessageConcurrentlyService
.
this
.
defaultMQPushConsumerImpl
.
hasHook
())
{
consumeMessageContext
.
getProps
().
put
(
MixAll
.
CONSUME_CONTEXT_TYPE
,
returnType
.
name
());
}
if
(
null
==
status
)
{
log
.
warn
(
"consumeMessage return null, Group: {} Msgs: {} MQ: {}"
,
ConsumeMessageConcurrentlyService
.
this
.
consumerGroup
,
...
...
client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
浏览文件 @
85467dfd
...
...
@@ -501,7 +501,11 @@ public class ConsumeMessageOrderlyService implements ConsumeMessageService {
}
else
if
(
ConsumeOrderlyStatus
.
SUCCESS
==
status
)
{
returnType
=
ConsumeReturnType
.
SUCCESS
;
}
consumeMessageContext
.
getProps
().
put
(
MixAll
.
CONSUME_CONTEXT_TYPE
,
returnType
.
name
());
if
(
ConsumeMessageOrderlyService
.
this
.
defaultMQPushConsumerImpl
.
hasHook
())
{
consumeMessageContext
.
getProps
().
put
(
MixAll
.
CONSUME_CONTEXT_TYPE
,
returnType
.
name
());
}
if
(
null
==
status
)
{
status
=
ConsumeOrderlyStatus
.
SUSPEND_CURRENT_QUEUE_A_MOMENT
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录