diff --git a/src/main/java/org/springframework/data/domain/PageImpl.java b/src/main/java/org/springframework/data/domain/PageImpl.java index acdb46adb..f5fcc6061 100644 --- a/src/main/java/org/springframework/data/domain/PageImpl.java +++ b/src/main/java/org/springframework/data/domain/PageImpl.java @@ -116,7 +116,7 @@ public class PageImpl extends Chunk implements Page { String contentType = "UNKNOWN"; List content = getContent(); - if (content.size() > 0) { + if (!content.isEmpty() && content.get(0) != null) { contentType = content.get(0).getClass().getName(); } diff --git a/src/test/java/org/springframework/data/domain/PageImplUnitTests.java b/src/test/java/org/springframework/data/domain/PageImplUnitTests.java index 94e6fc042..f8378e347 100755 --- a/src/test/java/org/springframework/data/domain/PageImplUnitTests.java +++ b/src/test/java/org/springframework/data/domain/PageImplUnitTests.java @@ -28,6 +28,7 @@ import org.junit.Test; * Unit test for {@link PageImpl}. * * @author Oliver Gierke + * @author Mark Paluch */ public class PageImplUnitTests { @@ -185,4 +186,13 @@ public class PageImplUnitTests { assertThat(page.hasPrevious()).isFalse(); assertThat(page.hasNext()).isFalse(); } + + @Test // DATACMNS-1750 + void toStringShouldNotInspectNullInstances() { + + Page page = new PageImpl<>(Collections.singletonList(null)); + + assertThat(page).hasToString("Page 1 of 1 containing UNKNOWN instances"); + } + }