diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0dcbb81b95..56dd8b0ae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
# Changelog
+## [6.101.1](https://github.com/googleapis/java-spanner/compare/v6.101.0...v6.101.1) (2025-09-26)
+
+
+### Bug Fixes
+
+* Potential NullPointerException in LocalConnectionChecker ([#4092](https://github.com/googleapis/java-spanner/issues/4092)) ([3b9f597](https://github.com/googleapis/java-spanner/commit/3b9f597ba60199a16556824568b24908ce938a69))
+
## [6.101.0](https://github.com/googleapis/java-spanner/compare/v6.100.0...v6.101.0) (2025-09-26)
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index bda0eb7a58..47598f1c64 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -24,7 +24,7 @@
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/google-cloud-spanner-bom/pom.xml b/google-cloud-spanner-bom/pom.xml
index 3da7be5b0b..33e4677274 100644
--- a/google-cloud-spanner-bom/pom.xml
+++ b/google-cloud-spanner-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner-bom
- 6.101.0
+ 6.101.1
pom
com.google.cloud
@@ -53,43 +53,43 @@
com.google.cloud
google-cloud-spanner
- 6.101.0
+ 6.101.1
com.google.cloud
google-cloud-spanner
test-jar
- 6.101.0
+ 6.101.1
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.101.0
+ 6.101.1
diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
index 0177847c5d..edabbdac62 100644
--- a/google-cloud-spanner-executor/pom.xml
+++ b/google-cloud-spanner-executor/pom.xml
@@ -5,14 +5,14 @@
4.0.0
com.google.cloud
google-cloud-spanner-executor
- 6.101.0
+ 6.101.1
jar
Google Cloud Spanner Executor
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index 7438c547ce..9bb8709315 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.cloud
google-cloud-spanner
- 6.101.0
+ 6.101.1
jar
Google Cloud Spanner
https://github.com/googleapis/java-spanner
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
google-cloud-spanner
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/LocalConnectionChecker.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/LocalConnectionChecker.java
index efda7f784d..62aafab423 100644
--- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/LocalConnectionChecker.java
+++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/connection/LocalConnectionChecker.java
@@ -23,6 +23,7 @@
import com.google.cloud.spanner.SpannerExceptionFactory;
import com.google.cloud.spanner.admin.instance.v1.stub.GrpcInstanceAdminStub;
import com.google.cloud.spanner.admin.instance.v1.stub.InstanceAdminStubSettings;
+import com.google.common.base.Strings;
import com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest;
import java.time.Duration;
@@ -42,6 +43,10 @@ class LocalConnectionChecker {
void checkLocalConnection(ConnectionOptions options) {
final String emulatorHost = System.getenv("SPANNER_EMULATOR_HOST");
String host = options.getHost() == null ? emulatorHost : options.getHost();
+ if (Strings.isNullOrEmpty(host)) {
+ return;
+ }
+
if (host.startsWith("https://")) {
host = host.substring(8);
}
@@ -49,7 +54,7 @@ void checkLocalConnection(ConnectionOptions options) {
host = host.substring(7);
}
// Only do the check if the host has been set to localhost.
- if (host != null && host.startsWith("localhost") && options.isUsePlainText()) {
+ if (host.startsWith("localhost") && options.isUsePlainText()) {
// Do a quick check to see if anything is actually running on the host.
try {
InstanceAdminStubSettings.Builder testEmulatorSettings =
diff --git a/grpc-google-cloud-spanner-admin-database-v1/pom.xml b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
index f9c5704483..a89656fcfc 100644
--- a/grpc-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-database-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.101.0
+ 6.101.1
grpc-google-cloud-spanner-admin-database-v1
GRPC library for grpc-google-cloud-spanner-admin-database-v1
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
index c7935c03a9..c5e56e818d 100644
--- a/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/grpc-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.101.0
+ 6.101.1
grpc-google-cloud-spanner-admin-instance-v1
GRPC library for grpc-google-cloud-spanner-admin-instance-v1
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/grpc-google-cloud-spanner-executor-v1/pom.xml b/grpc-google-cloud-spanner-executor-v1/pom.xml
index 528cc13ffe..f143922638 100644
--- a/grpc-google-cloud-spanner-executor-v1/pom.xml
+++ b/grpc-google-cloud-spanner-executor-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-executor-v1
- 6.101.0
+ 6.101.1
grpc-google-cloud-spanner-executor-v1
GRPC library for google-cloud-spanner
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/grpc-google-cloud-spanner-v1/pom.xml b/grpc-google-cloud-spanner-v1/pom.xml
index a0fa0575f3..0e2812e71f 100644
--- a/grpc-google-cloud-spanner-v1/pom.xml
+++ b/grpc-google-cloud-spanner-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.101.0
+ 6.101.1
grpc-google-cloud-spanner-v1
GRPC library for grpc-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/pom.xml b/pom.xml
index 62329bb26f..3ed2cc20b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud
google-cloud-spanner-parent
pom
- 6.101.0
+ 6.101.1
Google Cloud Spanner Parent
https://github.com/googleapis/java-spanner
@@ -61,47 +61,47 @@
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
proto-google-cloud-spanner-executor-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
grpc-google-cloud-spanner-executor-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
grpc-google-cloud-spanner-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-instance-v1
- 6.101.0
+ 6.101.1
com.google.api.grpc
grpc-google-cloud-spanner-admin-database-v1
- 6.101.0
+ 6.101.1
com.google.cloud
google-cloud-spanner
- 6.101.0
+ 6.101.1
diff --git a/proto-google-cloud-spanner-admin-database-v1/pom.xml b/proto-google-cloud-spanner-admin-database-v1/pom.xml
index c276ac9dee..af692c6a4d 100644
--- a/proto-google-cloud-spanner-admin-database-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-database-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-admin-database-v1
- 6.101.0
+ 6.101.1
proto-google-cloud-spanner-admin-database-v1
PROTO library for proto-google-cloud-spanner-admin-database-v1
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/proto-google-cloud-spanner-admin-instance-v1/pom.xml b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
index ea10655faf..2b129d2faf 100644
--- a/proto-google-cloud-spanner-admin-instance-v1/pom.xml
+++ b/proto-google-cloud-spanner-admin-instance-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-admin-instance-v1
- 6.101.0
+ 6.101.1
proto-google-cloud-spanner-admin-instance-v1
PROTO library for proto-google-cloud-spanner-admin-instance-v1
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/proto-google-cloud-spanner-executor-v1/pom.xml b/proto-google-cloud-spanner-executor-v1/pom.xml
index f097644ac7..557343a2e3 100644
--- a/proto-google-cloud-spanner-executor-v1/pom.xml
+++ b/proto-google-cloud-spanner-executor-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-executor-v1
- 6.101.0
+ 6.101.1
proto-google-cloud-spanner-executor-v1
Proto library for google-cloud-spanner
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/proto-google-cloud-spanner-v1/pom.xml b/proto-google-cloud-spanner-v1/pom.xml
index b9b93f99fd..4acd5bf612 100644
--- a/proto-google-cloud-spanner-v1/pom.xml
+++ b/proto-google-cloud-spanner-v1/pom.xml
@@ -4,13 +4,13 @@
4.0.0
com.google.api.grpc
proto-google-cloud-spanner-v1
- 6.101.0
+ 6.101.1
proto-google-cloud-spanner-v1
PROTO library for proto-google-cloud-spanner-v1
com.google.cloud
google-cloud-spanner-parent
- 6.101.0
+ 6.101.1
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 588379fb59..b8d534a4c8 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -32,7 +32,7 @@
com.google.cloud
google-cloud-spanner
- 6.101.0
+ 6.101.1
diff --git a/versions.txt b/versions.txt
index e892290a3a..ee56d9a157 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,13 +1,13 @@
# Format:
# module:released-version:current-version
-proto-google-cloud-spanner-admin-instance-v1:6.101.0:6.101.0
-proto-google-cloud-spanner-v1:6.101.0:6.101.0
-proto-google-cloud-spanner-admin-database-v1:6.101.0:6.101.0
-grpc-google-cloud-spanner-v1:6.101.0:6.101.0
-grpc-google-cloud-spanner-admin-instance-v1:6.101.0:6.101.0
-grpc-google-cloud-spanner-admin-database-v1:6.101.0:6.101.0
-google-cloud-spanner:6.101.0:6.101.0
-google-cloud-spanner-executor:6.101.0:6.101.0
-proto-google-cloud-spanner-executor-v1:6.101.0:6.101.0
-grpc-google-cloud-spanner-executor-v1:6.101.0:6.101.0
+proto-google-cloud-spanner-admin-instance-v1:6.101.1:6.101.1
+proto-google-cloud-spanner-v1:6.101.1:6.101.1
+proto-google-cloud-spanner-admin-database-v1:6.101.1:6.101.1
+grpc-google-cloud-spanner-v1:6.101.1:6.101.1
+grpc-google-cloud-spanner-admin-instance-v1:6.101.1:6.101.1
+grpc-google-cloud-spanner-admin-database-v1:6.101.1:6.101.1
+google-cloud-spanner:6.101.1:6.101.1
+google-cloud-spanner-executor:6.101.1:6.101.1
+proto-google-cloud-spanner-executor-v1:6.101.1:6.101.1
+grpc-google-cloud-spanner-executor-v1:6.101.1:6.101.1