From 77b9bc09680629e2cad11072b42f00e0d5dea351 Mon Sep 17 00:00:00 2001
From: hujie <hujie@aijiatui.com>
Date: Mon, 8 Oct 2018 21:40:02 +0800
Subject: [PATCH] solve conflict

---
 .../org/apache/rocketmq/broker/BrokerController.java     | 4 +---
 .../java/org/apache/rocketmq/common/BrokerConfig.java    | 9 +++------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
index c94bf447..e6c83ed5 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/BrokerController.java
@@ -302,8 +302,7 @@ public class BrokerController {
                 this.heartbeatThreadPoolQueue,
                 new ThreadFactoryImpl("HeartbeatThread_", true));
 
-<<<<<<< HEAD
-=======
+
             this.endTransactionExecutor = new BrokerFixedThreadPoolExecutor(
                 this.brokerConfig.getEndTransactionThreadPoolNums(),
                 this.brokerConfig.getEndTransactionThreadPoolNums(),
@@ -312,7 +311,6 @@ public class BrokerController {
                 this.endTransactionThreadPoolQueue,
                 new ThreadFactoryImpl("EndTransactionThread_"));
 
->>>>>>> 53a63460d3a1599a6c51058bb51a73746233022d
             this.consumerManageExecutor =
                 Executors.newFixedThreadPool(this.brokerConfig.getConsumerManageThreadPoolNums(), new ThreadFactoryImpl(
                     "ConsumerManageThread_"));
diff --git a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
index f08741a0..9920cc49 100644
--- a/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
+++ b/common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
@@ -64,14 +64,12 @@ public class BrokerConfig {
     private int clientManageThreadPoolNums = 32;
     private int consumerManageThreadPoolNums = 32;
     private int heartbeatThreadPoolNums = Math.min(32, Runtime.getRuntime().availableProcessors());
-<<<<<<< HEAD
-=======
 
     /**
      * Thread numbers for EndTransactionProcessor
      */
     private int endTransactionThreadPoolNums = 8 + Runtime.getRuntime().availableProcessors() * 2;
->>>>>>> 53a63460d3a1599a6c51058bb51a73746233022d
+
 
     private int flushConsumerOffsetInterval = 1000 * 5;
 
@@ -714,7 +712,7 @@ public class BrokerConfig {
         this.transactionCheckInterval = transactionCheckInterval;
     }
 
-<<<<<<< HEAD
+
     public boolean isAclPlug() {
         return isAclPlug;
     }
@@ -723,7 +721,6 @@ public class BrokerConfig {
         this.isAclPlug = isAclPlug;
     }
 
-=======
     public int getEndTransactionThreadPoolNums() {
         return endTransactionThreadPoolNums;
     }
@@ -747,5 +744,5 @@ public class BrokerConfig {
     public void setWaitTimeMillsInTransactionQueue(long waitTimeMillsInTransactionQueue) {
         this.waitTimeMillsInTransactionQueue = waitTimeMillsInTransactionQueue;
     }
->>>>>>> 53a63460d3a1599a6c51058bb51a73746233022d
+
 }
-- 
GitLab