Skip to content

Commit cc20728

Browse files
committed
fix: bornTime missing in lite pop requests when broker ACL2.0 is enabled
1 parent 9ad4a1b commit cc20728

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

broker/src/main/java/org/apache/rocketmq/broker/processor/PopLiteMessageProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ public RemotingCommand processRequest(final ChannelHandlerContext ctx, RemotingC
106106

107107
final long beginTimeMills = brokerController.getMessageStore().now();
108108
Channel channel = ctx.channel();
109-
request.addExtFieldIfNotExist(BORN_TIME, String.valueOf(System.currentTimeMillis()));
110-
if (Objects.equals(request.getExtFields().get(BORN_TIME), "0")) {
111-
request.addExtField(BORN_TIME, String.valueOf(System.currentTimeMillis()));
112-
}
113109
RemotingCommand response = RemotingCommand.createResponseCommand(PopLiteMessageResponseHeader.class);
114110
response.setOpaque(request.getOpaque());
115111

116112
final PopLiteMessageRequestHeader requestHeader =
117113
request.decodeCommandCustomHeader(PopLiteMessageRequestHeader.class, true);
114+
if (requestHeader.getBornTime() == 0) {
115+
request.addExtField(BORN_TIME, String.valueOf(beginTimeMills));
116+
requestHeader.setBornTime(beginTimeMills);
117+
}
118118
final PopLiteMessageResponseHeader responseHeader = (PopLiteMessageResponseHeader) response.readCustomHeader();
119119
RemotingCommand preCheckResponse = preCheck(ctx, requestHeader, response);
120120
if (preCheckResponse != null) {

0 commit comments

Comments
 (0)