Polishing

(cherry picked from commit 59a24b4)

spring-web/src/main/java/org/springframework/http/HttpRange.java

@@ -27,6 +27,7 @@ import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.ResourceRegion;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -170,11 +171,11 @@ public abstract class HttpRange {
 	 * @return the list of regions for the given resource
 	 */
 	public static List<ResourceRegion> toResourceRegions(List<HttpRange> ranges, Resource resource) {
-		if(ranges == null || ranges.size() == 0) {
+		if (CollectionUtils.isEmpty(ranges)) {
 			return Collections.emptyList();
 		}
 		List<ResourceRegion> regions = new ArrayList<ResourceRegion>(ranges.size());
-		for(HttpRange range : ranges) {
+		for (HttpRange range : ranges) {
 			regions.add(range.toResourceRegion(resource));
 		}
 		return regions;

spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpResponse.java

@@ -93,7 +93,9 @@ final class SimpleClientHttpResponse extends AbstractClientHttpResponse {
 				StreamUtils.drain(this.responseStream);
 				this.responseStream.close();
 			}
-			catch (IOException e) { }
+			catch (IOException ex) {
+				// ignore
+			}
 		}
 	}
 

spring-web/src/main/java/org/springframework/http/converter/ResourceRegionHttpMessageConverter.java

@@ -110,7 +110,7 @@ public class ResourceRegionHttpMessageConverter extends AbstractGenericHttpMessa
 		}
 		else {
 			Collection<ResourceRegion> regions = (Collection<ResourceRegion>) object;
-			if(regions.size() == 1) {
+			if (regions.size() == 1) {
 				writeResourceRegion(regions.iterator().next(), outputMessage);
 			}
 			else {