Skip to content

Commit f028a40

Browse files
committed
WB-1985: fix out of range array checks
1 parent 9f3d140 commit f028a40

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

src/main/java/org/ecocean/servlet/export/EncounterSearchExportMetadataExcel.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,11 @@ public void doPost(HttpServletRequest request, HttpServletResponse response) thr
218218
measurementColTitlesRanked.add(currentIndexInMeasureVals); // an array of indeces, a copy of which will be sorted
219219
}
220220
List<Integer> measurementColTitlesRankedSorted = measurementColTitlesRanked;
221-
Collections.sort(measurementColTitlesRankedSorted);
222-
for(int currentIndex : measurementColTitlesRankedSorted){
223-
sortedMeasurementColTitles.add(measureVals.get(currentIndex));
221+
if(measurementColTitlesRankedSorted!=null && measurementColTitlesRankedSorted.size()>0) {
222+
Collections.sort(measurementColTitlesRankedSorted);
223+
for(Integer currentIndex : measurementColTitlesRankedSorted){
224+
if(currentIndex!=null && currentIndex.intValue()!=-1)sortedMeasurementColTitles.add(measureVals.get(currentIndex.intValue()));
225+
}
224226
}
225227
}
226228
// end sorting

0 commit comments

Comments
 (0)