Fix bug in DataSourceBuilder

Dave Syer · Dave Syer · commit 43481725b9c7 · 2014-05-26T10:06:18.000+01:00
diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceBuilder.java
@@ -75,7 +75,8 @@ public DataSource build() {
 	}
 
 	private void maybeGetDriverClassName() {
-		if (!this.properties.containsKey("driverClassName")) {
+		if (!this.properties.containsKey("driverClassName")
+				&& this.properties.containsKey("url")) {
 			String cls = this.driverClassNameProvider.getDriverClassName(this.properties
 					.get("url"));
 			this.properties.put("driverClassName", cls);

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ public DataSource build() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`private void maybeGetDriverClassName() {`
`78`		`- if (!this.properties.containsKey("driverClassName")) {`
	`78`	`+ if (!this.properties.containsKey("driverClassName")`
	`79`	`+ && this.properties.containsKey("url")) {`
`79`	`80`	`String cls = this.driverClassNameProvider.getDriverClassName(this.properties`
`80`	`81`	`.get("url"));`
`81`	`82`	`this.properties.put("driverClassName", cls);`