Merge branch '1.1.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceProperties.java

@@ -120,7 +120,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 		if (StringUtils.hasText(this.username)) {
 			return this.username;
 		}
-		if (EmbeddedDatabaseConnection.isEmbedded(this.driverClassName)) {
+		if (EmbeddedDatabaseConnection.isEmbedded(getDriverClassName())) {
 			return "sa";
 		}
 		return null;
@@ -130,7 +130,7 @@ public class DataSourceProperties implements BeanClassLoaderAware, InitializingB
 		if (StringUtils.hasText(this.password)) {
 			return this.password;
 		}
-		if (EmbeddedDatabaseConnection.isEmbedded(this.driverClassName)) {
+		if (EmbeddedDatabaseConnection.isEmbedded(getDriverClassName())) {
 			return "";
 		}
 		return null;