[TUBEMQ-127] Fixed a bug & minor changes (apache#85)

kinfuy · May 19, 2020 · c4380d2 · c4380d2
1 parent 5f4c4e0
commit c4380d2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/RmtDataCache.java b/tubemq-client/src/main/java/org/apache/tubemq/client/consumer/RmtDataCache.java
@@ -273,9 +273,7 @@ public PartitionSelectResult pushSelect() {
     protected boolean isPartitionInUse(String partitionKey, long usedToken) {
         if (partitionMap.containsKey(partitionKey)) {
             Long curToken = partitionUsedMap.get(partitionKey);
-            if (curToken != null && curToken == usedToken) {
-                return true;
-            }
+            return curToken != null && curToken == usedToken;
         }
         return false;
     }
@@ -310,9 +308,7 @@ public boolean bookPartition(String partitionKey) {
         Integer isReged = partRegisterBookMap.get(partitionKey);
         if (isReged == null) {
             isReged = partRegisterBookMap.putIfAbsent(partitionKey, 1);
-            if (isReged == null) {
-                return true;
-            }
+            return isReged == null;
         }
         return false;
     }
@@ -628,8 +624,7 @@ public ConcurrentLinkedQueue<Partition> getPartitionByBroker(BrokerInfo brokerIn
 
     public void resumeTimeoutConsumePartitions(long allowedPeriodTimes) {
         if (!partitionUsedMap.isEmpty()) {
-            List<String> partKeys = new ArrayList<>();
-            partKeys.addAll(partitionUsedMap.keySet());
+            List<String> partKeys = new ArrayList<>(partitionUsedMap.keySet());
             for (String keyId : partKeys) {
                 Long oldTime = partitionUsedMap.get(keyId);
                 if (oldTime != null && System.currentTimeMillis() - oldTime > allowedPeriodTimes) {

diff --git a/tubemq-core/src/main/java/org/apache/tubemq/corebase/utils/MapBackedSet.java b/tubemq-core/src/main/java/org/apache/tubemq/corebase/utils/MapBackedSet.java
@@ -19,6 +19,7 @@
 
 import java.io.Serializable;
 import java.util.AbstractSet;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
@@ -55,7 +56,7 @@ public boolean contains(Object o) {
 
     @Override
     public Iterator<E> iterator() {
-        return map.keySet().iterator();
+        return new ArrayList<>(map.keySet()).iterator();
     }
 
     @Override