fix for UT failed

streamnative · Feb 5, 2021 · 9e123db · 9e123db
1 parent d1e196f
commit 9e123db
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandler.java b/kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/KafkaRequestHandler.java
@@ -179,8 +179,8 @@ public class KafkaRequestHandler extends KafkaCommandDecoder {
     private final int defaultNumPartitions;
     public final int maxReadEntriesNum;
     // store the group name for current connected client.
-    public final ConcurrentHashMap<String, String> currentConnectedGroup;
-    public final String groupIdStoredPath;
+    private final ConcurrentHashMap<String, String> currentConnectedGroup;
+    private final String groupIdStoredPath;
     @Getter
     private final EntryFormatter entryFormatter;
 

diff --git a/kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/KafkaTopicManager.java b/kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/KafkaTopicManager.java
@@ -381,7 +381,7 @@ public void deReference(String topicName) {
     public CompletableFuture<Consumer> getGroupConsumers(String groupId, TopicPartition kafkaPartition) {
         // make sure internal consumer existed
         CompletableFuture<Consumer> consumerFuture = new CompletableFuture<>();
-        if (!requestHandler.getGroupCoordinator()
+        if (groupId == null || groupId.isEmpty() || !requestHandler.getGroupCoordinator()
                 .getOffsetAcker().getConsumer(groupId, kafkaPartition).isDone()) {
             log.warn("not get consumer for group {} this time", groupId);
             consumerFuture.complete(null);

diff --git a/kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/utils/ZooKeeperUtils.java b/kafka-impl/src/main/java/io/streamnative/pulsar/handlers/kop/utils/ZooKeeperUtils.java
@@ -47,7 +47,7 @@ public static void createPath(ZooKeeper zooKeeper, String zkPath, String subPath
     }
 
     public static String getData(ZooKeeper zooKeeper, String zkPath, String subPath) {
-        String data = "";
+        String data = null;
         try {
             String addSubPath = zkPath + subPath;
             Stat zkStat = zooKeeper.exists(addSubPath, true);