DATAMONGO-1342 - Fixed potential NullPointerException in MongoQueryCreator.

MongoQueryCreator.nextAsArray(…) now returns a single element object array in case null is handed to the method. It previously failed with a NullPointerException.

Author: odrotbohm

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java

@@ -382,7 +382,7 @@ private Object[] nextAsArray(PotentiallyConvertingIterator iterator, MongoPersis
 
 		if (next instanceof Collection) {
 			return ((Collection<?>) next).toArray();
-		} else if (next.getClass().isArray()) {
+		} else if (next != null && next.getClass().isArray()) {
 			return (Object[]) next;
 		}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java

@@ -661,6 +661,20 @@ public void likeShouldBeTreatedCorrectlyWhenUsedWithWildcardOnly() {
 		assertThat(query, is(query(where("username").regex(".*"))));
 	}
 
+	/**
+	 * @see DATAMONGO-1342
+	 */
+	@Test
+	public void bindsNullValueToContainsClause() {
+
+		PartTree partTree = new PartTree("emailAddressesContains", User.class);
+
+		ConvertingParameterAccessor accessor = getAccessor(converter, new Object[] { null });
+		Query query = new MongoQueryCreator(partTree, accessor, context).createQuery();
+
+		assertThat(query, is(query(where("emailAddresses").in((Object) null))));
+	}
+
 	interface PersonRepository extends Repository<Person, Long> {
 
 		List<Person> findByLocationNearAndFirstname(Point location, Distance maxDistance, String firstname);