From 8a67259aefcbc1db5545e7dad7da23c3462f140d Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 18 Apr 2013 12:15:36 +0200 Subject: [PATCH] DATACMNS-236 - Fixed potential NPEs in SortHandlerMethodArgumentResolver. --- .../data/web/SortHandlerMethodArgumentResolver.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java index 20a29a248..22d7355e5 100644 --- a/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java +++ b/src/main/java/org/springframework/data/web/SortHandlerMethodArgumentResolver.java @@ -16,6 +16,7 @@ package org.springframework.data.web; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import org.springframework.beans.factory.annotation.Qualifier; @@ -306,7 +307,7 @@ public class SortHandlerMethodArgumentResolver implements HandlerMethodArgumentR builder.add(order.getProperty()); } - return builder.dumpExpressionIfPresentInto(expressions); + return builder == null ? Collections. emptyList() : builder.dumpExpressionIfPresentInto(expressions); } /** @@ -336,7 +337,7 @@ public class SortHandlerMethodArgumentResolver implements HandlerMethodArgumentR builder.add(order.getProperty()); } - return builder.dumpExpressionIfPresentInto(expressions); + return builder == null ? Collections. emptyList() : builder.dumpExpressionIfPresentInto(expressions); } /**