From 0451232eb40550c96090f4c7316e631a293e2be2 Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Tue, 1 Jul 2014 15:11:36 +0200
Subject: [PATCH] Polishing (cherry picked from commit 86ea305)

---
 .../datasource/embedded/EmbeddedDatabaseFactory.java  |  2 +-
 .../java/org/springframework/http/HttpHeaders.java    | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
index 2df8b1fd46..9ce946ee76 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
@@ -20,7 +20,6 @@ import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.logging.Logger;
-
 import javax.sql.DataSource;
 
 import org.apache.commons.logging.Log;
@@ -63,6 +62,7 @@ public class EmbeddedDatabaseFactory {
 	 */
 	public static final String DEFAULT_DATABASE_NAME = "testdb";
 
+
 	private static final Log logger = LogFactory.getLog(EmbeddedDatabaseFactory.class);
 
 	private String databaseName = DEFAULT_DATABASE_NAME;
diff --git a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
index 6810b90bad..b6065e9cac 100644
--- a/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
+++ b/spring-web/src/main/java/org/springframework/http/HttpHeaders.java
@@ -155,12 +155,15 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
 	 */
 	public List<MediaType> getAccept() {
 		String value = getFirst(ACCEPT);
-		List<MediaType> result = (value != null) ? MediaType.parseMediaTypes(value) : Collections.<MediaType>emptyList();
+		List<MediaType> result = (value != null ? MediaType.parseMediaTypes(value) : Collections.<MediaType>emptyList());
 
 		// Some containers parse 'Accept' into multiple values
-		if ((result.size() == 1) && (get(ACCEPT).size() > 1)) {
-			value = StringUtils.collectionToCommaDelimitedString(get(ACCEPT));
-			result = MediaType.parseMediaTypes(value);
+		if (result.size() == 1) {
+			List<String> acceptHeader = get(ACCEPT);
+			if (acceptHeader.size() > 1) {
+				value = StringUtils.collectionToCommaDelimitedString(acceptHeader);
+				result = MediaType.parseMediaTypes(value);
+			}
 		}
 
 		return result;