From a3a851e24cdec6af380f5ecb37248aa8916a9234 Mon Sep 17 00:00:00 2001
From: Daniel Gerhardt <code@dgerhardt.net>
Date: Tue, 7 Jul 2015 18:10:20 +0200
Subject: [PATCH] Fix potential NPE in RangeAspect
---
src/main/java/de/thm/arsnova/aop/RangeAspect.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/de/thm/arsnova/aop/RangeAspect.java b/src/main/java/de/thm/arsnova/aop/RangeAspect.java
index 03bd80fb..e53d29c1 100644
--- a/src/main/java/de/thm/arsnova/aop/RangeAspect.java
+++ b/src/main/java/de/thm/arsnova/aop/RangeAspect.java
@@ -83,7 +83,7 @@ public class RangeAspect {
List<?> list = (List<?>) pjp.proceed();
- if (matcher != null && matcher.matches()) {
+ if (list != null && matcher != null && matcher.matches()) {
int totalSize = -1;
if (list instanceof PaginationListDecorator) {
PaginationListDecorator<?> pl = (PaginationListDecorator<?>) list;
--
GitLab