fixed a minor error in AOPUtils if list contains null items

Erudika · Jun 9, 2021 · 9e6fec9 · 9e6fec9
1 parent b53887e
commit 9e6fec9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/para-server/src/main/java/com/erudika/para/aop/AOPUtils.java b/para-server/src/main/java/com/erudika/para/aop/AOPUtils.java
@@ -42,8 +42,12 @@ protected static <T> List<T> getArgOfListOfType(Object[] args, Class<T> type) {
 			for (Object arg : args) {
 				if (arg != null && arg instanceof List) {
 					List<T> list = (List) arg;
-					if (!list.isEmpty() && type.isAssignableFrom(list.get(0).getClass())) {
-						return list;
+					if (!list.isEmpty()) {
+						for (T item : list) {
+							if (item != null && type.isAssignableFrom(item.getClass())) {
+								return list;
+							}
+						}
 					}
 				}
 			}

diff --git a/para-server/src/test/java/com/erudika/para/aop/AOPUtilsTest.java b/para-server/src/test/java/com/erudika/para/aop/AOPUtilsTest.java
@@ -63,12 +63,18 @@ public void testUtils() throws Exception {
 		list2.add(new Tag("tagzz3"));
 		List<String> badList = new ArrayList<>();
 		badList.add("XXXtagXXX");
+		List<Sysprop> badList2 = new ArrayList<>();
+		badList2.add(null);
+		badList2.add(null);
+		badList2.add(null);
+		badList2.add(new Sysprop());
 
 		assertSame(tag, getArgOfParaObject(new Object[]{tag, "string"}));
 		assertNull(getArgOfParaObject(new Object[]{"string"}));
 		assertEquals(list1, getArgOfListOfType(new Object[]{list1}, ParaObject.class));
 		assertEquals(list2, getArgOfListOfType(new Object[]{list2}, ParaObject.class));
 		assertNull(getArgOfListOfType(new Object[]{badList}, ParaObject.class));
+		assertEquals(badList2, getArgOfListOfType(new Object[]{badList2}, ParaObject.class));
 
 		assertNull(getFirstArgOfString(new Object[]{list1}));
 		assertNotNull(getFirstArgOfString(new Object[]{Integer.valueOf(123), "asd"}));