Skip to content

Commit dc4f368

Browse files
dongeforeverdongeforever
authored
Merge pull request apache#108 from aCoder2013/feature/correct-spelling-mistake
[ROCKETMQ-207]Correct spelling mistake in RouteInfoManager.java
2 parents e8900a8 + eabe47f commit dc4f368

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

‎client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageConcurrentlyService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public ConsumeMessageDirectlyResult consumeMessageDirectly(MessageExt msg, Strin
161161

162162
final long beginTime = System.currentTimeMillis();
163163

164-
log.info("consumeMessageDirectly receive new messge: {}", msg);
164+
log.info("consumeMessageDirectly receive new message: {}", msg);
165165

166166
try {
167167
ConsumeConcurrentlyStatus status = this.messageListener.consumeMessage(msgs, context);

‎client/src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public ConsumeMessageDirectlyResult consumeMessageDirectly(MessageExt msg, Strin
144144

145145
final long beginTime = System.currentTimeMillis();
146146

147-
log.info("consumeMessageDirectly receive new messge: {}", msg);
147+
log.info("consumeMessageDirectly receive new message: {}", msg);
148148

149149
try {
150150
ConsumeOrderlyStatus status = this.messageListener.consumeMessage(msgs, context);

‎namesrv/src/main/java/org/apache/rocketmq/namesrv/routeinfo/RouteInfoManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public RegisterBrokerResult registerBroker(
152152
channel,
153153
haServerAddr));
154154
if (null == prevBrokerLiveInfo) {
155-
log.info("new broker registerd, {} HAServer: {}", brokerAddr, haServerAddr);
155+
log.info("new broker registered, {} HAServer: {}", brokerAddr, haServerAddr);
156156
}
157157

158158
if (filterServerList != null) {
@@ -205,7 +205,7 @@ private void createAndUpdateQueueData(final String brokerName, final TopicConfig
205205
queueDataList = new LinkedList<QueueData>();
206206
queueDataList.add(queueData);
207207
this.topicQueueTable.put(topicConfig.getTopicName(), queueDataList);
208-
log.info("new topic registerd, {} {}", topicConfig.getTopicName(), queueData);
208+
log.info("new topic registered, {} {}", topicConfig.getTopicName(), queueData);
209209
} else {
210210
boolean addNewOne = true;
211211

‎store/src/main/java/org/apache/rocketmq/store/CommitLog.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ else if (dispatchRequest.isSuccess() && size == 0) {
185185
index++;
186186
if (index >= mappedFiles.size()) {
187187
// Current branch can not happen
188-
log.info("recover last 3 physics file over, last maped file " + mappedFile.getFileName());
188+
log.info("recover last 3 physics file over, last mapped file " + mappedFile.getFileName());
189189
break;
190190
} else {
191191
mappedFile = mappedFiles.get(index);
@@ -403,7 +403,7 @@ public void recoverAbnormally() {
403403
for (; index >= 0; index--) {
404404
mappedFile = mappedFiles.get(index);
405405
if (this.isMappedFileMatchedRecover(mappedFile)) {
406-
log.info("recover from this maped file " + mappedFile.getFileName());
406+
log.info("recover from this mapped file " + mappedFile.getFileName());
407407
break;
408408
}
409409
}
@@ -445,7 +445,7 @@ else if (size == 0) {
445445
if (index >= mappedFiles.size()) {
446446
// The current branch under normal circumstances should
447447
// not happen
448-
log.info("recover physics file over, last maped file " + mappedFile.getFileName());
448+
log.info("recover physics file over, last mapped file " + mappedFile.getFileName());
449449
break;
450450
} else {
451451
mappedFile = mappedFiles.get(index);
@@ -571,7 +571,7 @@ public PutMessageResult putMessage(final MessageExtBrokerInner msg) {
571571
mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise
572572
}
573573
if (null == mappedFile) {
574-
log.error("create maped file1 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
574+
log.error("create mapped file1 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
575575
beginTimeInLock = 0;
576576
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null);
577577
}
@@ -586,7 +586,7 @@ public PutMessageResult putMessage(final MessageExtBrokerInner msg) {
586586
mappedFile = this.mappedFileQueue.getLastMappedFile(0);
587587
if (null == mappedFile) {
588588
// XXX: warn and notify me
589-
log.error("create maped file2 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
589+
log.error("create mapped file2 error, topic: " + msg.getTopic() + " clientAddr: " + msg.getBornHostString());
590590
beginTimeInLock = 0;
591591
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result);
592592
}
@@ -721,7 +721,7 @@ public PutMessageResult putMessages(final MessageExtBatch messageExtBatch) {
721721
mappedFile = this.mappedFileQueue.getLastMappedFile(0); // Mark: NewFile may be cause noise
722722
}
723723
if (null == mappedFile) {
724-
log.error("Create maped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
724+
log.error("Create mapped file1 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
725725
beginTimeInLock = 0;
726726
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, null);
727727
}
@@ -736,7 +736,7 @@ public PutMessageResult putMessages(final MessageExtBatch messageExtBatch) {
736736
mappedFile = this.mappedFileQueue.getLastMappedFile(0);
737737
if (null == mappedFile) {
738738
// XXX: warn and notify me
739-
log.error("Create maped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
739+
log.error("Create mapped file2 error, topic: {} clientAddr: {}", messageExtBatch.getTopic(), messageExtBatch.getBornHostString());
740740
beginTimeInLock = 0;
741741
return new PutMessageResult(PutMessageStatus.CREATE_MAPEDFILE_FAILED, result);
742742
}

‎store/src/main/java/org/apache/rocketmq/store/ConsumeQueue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void recover() {
121121
index++;
122122
if (index >= mappedFiles.size()) {
123123

124-
log.info("recover last consume queue file over, last maped file "
124+
log.info("recover last consume queue file over, last mapped file "
125125
+ mappedFile.getFileName());
126126
break;
127127
} else {

0 commit comments

Comments
 (0)