From eaa53f8cd6e4629a85c914442e7bf05019215d79 Mon Sep 17 00:00:00 2001
From: Scott Frederick <sfrederick@pivotal.io>
Date: Mon, 23 Oct 2017 14:00:24 -0500
Subject: [PATCH] Fix inconsistency in building JDBC URL.

---
 .../cloud/service/common/RelationalServiceInfo.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
index b262fdb..967bfc7 100644
--- a/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
+++ b/spring-cloud-core/src/main/java/org/springframework/cloud/service/common/RelationalServiceInfo.java
@@ -52,7 +52,7 @@ public abstract class RelationalServiceInfo extends UriBasedServiceInfo {
 
 	private String formatQuery() {
 		if (getQuery() != null) {
-			if (getUserName() == null && getPassword() == null) {
+			if (formatUserinfo().isEmpty()) {
 				return String.format("?%s", getQuery());
 			} else {
 				return String.format("&%s", getQuery());