You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by li...@apache.org on 2018/07/14 06:07:22 UTC
[rocketmq] branch develop updated: Fix issues brought about while
merging pull requests
This is an automated email from the ASF dual-hosted git repository.
lizhanhui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new 3ccd6f9 Fix issues brought about while merging pull requests
3ccd6f9 is described below
commit 3ccd6f97e5b3d1d2c46de566486f8a82c46e20de
Author: duheng <39...@users.noreply.github.com>
AuthorDate: Sat Jul 14 14:07:19 2018 +0800
Fix issues brought about while merging pull requests
---
.../client/consumer/rebalance/AllocateMachineRoomNearby.java | 4 ++--
.../apache/rocketmq/remoting/netty/NettyRemotingAbstractTest.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMachineRoomNearby.java b/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMachineRoomNearby.java
index 9b166e7..ec0f7f6 100644
--- a/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMachineRoomNearby.java
+++ b/client/src/main/java/org/apache/rocketmq/client/consumer/rebalance/AllocateMachineRoomNearby.java
@@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.client.consumer.AllocateMessageQueueStrategy;
import org.apache.rocketmq.client.log.ClientLogger;
import org.apache.rocketmq.common.message.MessageQueue;
-import org.slf4j.Logger;
+import org.apache.rocketmq.logging.InternalLogger;
/**
* An allocate strategy proxy for based on machine room nearside priority. An actual allocate strategy can be
@@ -35,7 +35,7 @@ import org.slf4j.Logger;
* no alive consumer to monopolize them.
*/
public class AllocateMachineRoomNearby implements AllocateMessageQueueStrategy {
- private final Logger log = ClientLogger.getLog();
+ private final InternalLogger log = ClientLogger.getLog();
private final AllocateMessageQueueStrategy allocateMessageQueueStrategy;//actual allocate strategy
private final MachineRoomResolver machineRoomResolver;
diff --git a/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstractTest.java b/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstractTest.java
index 99aab9e..c3da3e9 100644
--- a/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstractTest.java
+++ b/remoting/src/test/java/org/apache/rocketmq/remoting/netty/NettyRemotingAbstractTest.java
@@ -36,7 +36,7 @@ public class NettyRemotingAbstractTest {
@Test
public void testProcessResponseCommand() throws InterruptedException {
final Semaphore semaphore = new Semaphore(0);
- ResponseFuture responseFuture = new ResponseFuture(1, 3000, new InvokeCallback() {
+ ResponseFuture responseFuture = new ResponseFuture(null,1, 3000, new InvokeCallback() {
@Override
public void operationComplete(final ResponseFuture responseFuture) {
assertThat(semaphore.availablePermits()).isEqualTo(0);
@@ -57,7 +57,7 @@ public class NettyRemotingAbstractTest {
@Test
public void testProcessResponseCommand_NullCallBack() throws InterruptedException {
final Semaphore semaphore = new Semaphore(0);
- ResponseFuture responseFuture = new ResponseFuture(1, 3000, null,
+ ResponseFuture responseFuture = new ResponseFuture(null,1, 3000, null,
new SemaphoreReleaseOnlyOnce(semaphore));
remotingAbstract.responseTable.putIfAbsent(1, responseFuture);
@@ -72,7 +72,7 @@ public class NettyRemotingAbstractTest {
@Test
public void testProcessResponseCommand_RunCallBackInCurrentThread() throws InterruptedException {
final Semaphore semaphore = new Semaphore(0);
- ResponseFuture responseFuture = new ResponseFuture(1, 3000, new InvokeCallback() {
+ ResponseFuture responseFuture = new ResponseFuture(null,1, 3000, new InvokeCallback() {
@Override
public void operationComplete(final ResponseFuture responseFuture) {
assertThat(semaphore.availablePermits()).isEqualTo(0);