| commit | 89e6a93277205a9dbc76c18e249919a745d224d2 | [log] [tgz] |
|---|---|---|
| author | Murtadha Hubail <mhubail@apache.org> | Wed Oct 18 19:38:49 2017 +0300 |
| committer | Murtadha Hubail <mhubail@apache.org> | Wed Oct 18 13:08:51 2017 -0700 |
| tree | d9df09d57b0bcffb144ec05e54649e81907b4721 | |
| parent | 536c707dc2ffc92a9e2f331b8765697367d9ab3a [diff] |
[ASTERIXDB-2135][IDX] Prevent NPE in LSMBTreePointSearchCursor - user model changes: no - storage format changes: no - interface changes: no Details: - Prevent NPE on LSMBTreePointSearchCursor.close Change-Id: I062c1200d9c5a1a574a1ccdb32be0ac011406d92 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2081 Sonar-Qube: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Ian Maxon <imaxon@apache.org>
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java index c178b51..0f7aa38 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
@@ -214,9 +214,7 @@ public void close() throws HyracksDataException { if (lsmHarness != null) { try { - for (int i = 0; i < rangeCursors.length; i++) { - rangeCursors[i].close(); - } + closeCursors(); rangeCursors = null; } finally { lsmHarness.endSearch(opCtx); @@ -265,4 +263,13 @@ return false; } + private void closeCursors() throws HyracksDataException { + if (rangeCursors != null) { + for (int i = 0; i < rangeCursors.length; ++i) { + if (rangeCursors[i] != null) { + rangeCursors[i].close(); + } + } + } + } }