#878 and #1121 fixed an NPE introduced by the latest bug fix

TheCoder4eu · May 18, 2020 · be5d415 · be5d415
1 parent 166e233
commit be5d415
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/net/bootsfaces/component/dataTable/DataTable.java b/src/main/java/net/bootsfaces/component/dataTable/DataTable.java
@@ -275,12 +275,14 @@ public void queueEvent(FacesEvent event) {
 		String typeOfSelection = (String) context.getExternalContext().getRequestParameterMap().get("typeOfSelection");
 		context.getELContext().getELResolver().setValue(context.getELContext(), null, "typeOfSelection", typeOfSelection);
 
-		//https://datatables.net/reference/event/deselect#Description
+		// https://datatables.net/reference/event/deselect#Description
 		// split the array of indexes
 		List<Integer> indexList = new ArrayList<>();
-		Matcher regexMatcher = Pattern.compile("(\\d+)").matcher(indexes);
-		while (regexMatcher.find()) {
-			indexList.add(Integer.valueOf(regexMatcher.group()));
+		if (null != indexes) {
+			Matcher regexMatcher = Pattern.compile("(\\d+)").matcher(indexes);
+			if (regexMatcher.find()) {
+				indexList.add(Integer.valueOf(regexMatcher.group()));
+			}
 		}
 
 		if (indexList.size() > 0) {