Fix NPE when filtering read entries (apache#10704)

### Motivation When ConcurrentOpenLongPairRangeSet does not contain any data, calling span() will throw NPE ### Modifications return null instead
yangl · Jun 23, 2021 · dbfaad3 · dbfaad3
1 parent 1e6db67
commit dbfaad3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java
@@ -2042,8 +2042,8 @@ List<Entry> filterReadEntries(List<Entry> entries) {
                 log.debug("[{}] [{}] Filtering entries {} - alreadyDeleted: {}", ledger.getName(), name, entriesRange,
                         individualDeletedMessages);
             }
-
-            if (individualDeletedMessages.isEmpty() || !entriesRange.isConnected(individualDeletedMessages.span())) {
+            if (individualDeletedMessages.isEmpty() || individualDeletedMessages.span() == null ||
+                    !entriesRange.isConnected(individualDeletedMessages.span())) {
                 // There are no individually deleted messages in this entry list, no need to perform filtering
                 if (log.isDebugEnabled()) {
                     log.debug("[{}] [{}] No filtering needed for entries {}", ledger.getName(), name, entriesRange);

diff --git a/...c/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java b/...c/main/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSet.java
@@ -171,6 +171,9 @@ public void clear() {
 
     @Override
     public Range<T> span() {
+        if (rangeBitSetMap.size() == 0) {
+            return null;
+        }
         Entry<Long, BitSet> firstSet = rangeBitSetMap.firstEntry();
         Entry<Long, BitSet> lastSet = rangeBitSetMap.lastEntry();
         int first = firstSet.getValue().nextSetBit(0);

diff --git a/...st/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSetTest.java b/...st/java/org/apache/pulsar/common/util/collections/ConcurrentOpenLongPairRangeSetTest.java
@@ -114,6 +114,12 @@ public void testAddCompareCompareWithGuava() {
         }
     }
 
+    @Test
+    public void testNPE() {
+        ConcurrentOpenLongPairRangeSet<LongPair> set = new ConcurrentOpenLongPairRangeSet<>(consumer);
+        assertNull(set.span());
+    }
+
     @Test
     public void testDeleteCompareWithGuava() {