fix: fix error message if emulator host is set

olavloite · olavloite · commit 47c3b99d89d2 · 2021-03-23T19:42:59.000+01:00
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/ConnectionOptions.java
@@ -775,7 +775,7 @@ private void checkLocalConnection() {
         }
       } catch (UnavailableException e) {
         String msg;
-        if (emulatorHost == null) {
+        if (getHost() != null) {
           msg =
               String.format(
                   "The connection string '%s' contains host '%s', but no running"
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/ConnectionOptionsTest.java
@@ -492,8 +492,6 @@ public void testLocalConnectionError() {
           .contains(
               String.format(
                   "The connection string '%s' contains host 'localhost:1', but no running", uri));
-    } finally {
-      SpannerPool.closeSpannerPool();
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -775,7 +775,7 @@ private void checkLocalConnection() {`
`775`	`775`	`}`
`776`	`776`	`} catch (UnavailableException e) {`
`777`	`777`	`String msg;`
`778`		`-if (emulatorHost == null) {`
	`778`	`+if (getHost() != null) {`
`779`	`779`	`msg =`
`780`	`780`	`String.format(`
`781`	`781`	`"The connection string '%s' contains host '%s', but no running"`
Original file line number	Diff line number	Diff line change
`@@ -492,8 +492,6 @@ public void testLocalConnectionError() {`
`492`	`492`	`.contains(`
`493`	`493`	`String.format(`
`494`	`494`	`"The connection string '%s' contains host 'localhost:1', but no running", uri));`
`495`		`-} finally {`
`496`		`-SpannerPool.closeSpannerPool();`
`497`	`495`	`}`
`498`	`496`	`}`
`499`	`497`