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 9b166e7a96c578e461aa870cddfd35fe6e171719..ec0f7f6489d621ff09747f9bb591827dab45fb76 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 99aab9e075728639f496747d6d2c55c81a7dcd3f..c3da3e9af5982aa54dd6a728c80a3c803b206450 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);