@@ -4,14 +4,14 @@
 "git": {
 "name": ".",
 "remote": "https://.com/googleapis/java-spanner.git",
-"sha": "844f0fe5308797105f2de876290f40fb230c4fa6"
+"sha": "fc3335c55eb504827e835b6e5a1d6fc5dea2c124"
 }
 },
 {
 "git": {
 "name": "synthtool",
 "remote": "https://.com/googleapis/synthtool.git",
-"sha": "ff6b759fcb58f216f62b48d5be0bb85fafbc3bb2"
+"sha": "06a8cd0ff7e81b05e6c503eab510ec622384caa7"
 }
 }
 ]

@@ -1,5 +1,33 @@
 # Changelog
 
+## [6.4.0](https://www..com/googleapis/java-spanner/compare/v6.3.3...v6.4.0) (2021-04-29)
+
+
+### Features
+
+* adds getValue to ResultSet ([#1073](https://www..com/googleapis/java-spanner/issues/1073)) ([7792c90](https://www..com/googleapis/java-spanner/commit/7792c9085a6e4ce1fb9fe2f8df4279f30539d87e))
+
+
+### Bug Fixes
+
+* allow using case-insensitive user-agent key ([#1110](https://www..com/googleapis/java-spanner/issues/1110)) ([f4f9e43](https://www..com/googleapis/java-spanner/commit/f4f9e43ce102788b81c032df8da223108e484252))
+* check for timeout in connection after last statement finished ([#1086](https://www..com/googleapis/java-spanner/issues/1086)) ([aec0b54](https://www..com/googleapis/java-spanner/commit/aec0b541672d66fe0c34816b1c1b5a6bdeffccd1)), closes [#1077](https://www..com/googleapis/java-spanner/issues/1077)
+* check for timeout in connection after last statement finished ([#1086](https://www..com/googleapis/java-spanner/issues/1086)) ([51d753c](https://www..com/googleapis/java-spanner/commit/51d753c507e7248132eb5d6ea2c4b735542eda49)), closes [#1077](https://www..com/googleapis/java-spanner/issues/1077)
+* do not keep references to invalidated clients ([#1093](https://www..com/googleapis/java-spanner/issues/1093)) ([b4595a6](https://www..com/googleapis/java-spanner/commit/b4595a6b52417c716f8e70563bb5a7ef05067707)), closes [#1089](https://www..com/googleapis/java-spanner/issues/1089)
+* prevent potential NullPointerException in Struct with Array field that contains null elements ([#1107](https://www..com/googleapis/java-spanner/issues/1107)) ([c414abb](https://www..com/googleapis/java-spanner/commit/c414abb9ec59f8200ba20e08846e442321de76bd)), closes [#1106](https://www..com/googleapis/java-spanner/issues/1106)
+
+
+### Dependencies
+
+* update dependency com.google.cloud:google-cloud-monitoring to v2.2.1 ([#1104](https://www..com/googleapis/java-spanner/issues/1104)) ([37ca990](https://www..com/googleapis/java-spanner/commit/37ca9905bb150d1791e70103e002261e40261b05))
+* update dependency com.google.cloud:google-cloud-trace to v1.3.3 ([#1103](https://www..com/googleapis/java-spanner/issues/1103)) ([b4327c0](https://www..com/googleapis/java-spanner/commit/b4327c0666bb97d1d591b5ce65a6ecdc51f5a49d))
+
+
+### Documentation
+
+* fix javadoc for Date type ([#1102](https://www..com/googleapis/java-spanner/issues/1102)) ([ce095f7](https://www..com/googleapis/java-spanner/commit/ce095f7b0c196e03ea248eeb9c5060f4f430d8c4))
+* use default timeout for restore operation ([#1109](https://www..com/googleapis/java-spanner/issues/1109)) ([3f3c13e](https://www..com/googleapis/java-spanner/commit/3f3c13e7fcbf08b8ab6f0d11d7451b3ae86c9500)), closes [#1019](https://www..com/googleapis/java-spanner/issues/1019)
+
 ### [6.3.3](https://www..com/googleapis/java-spanner/compare/v6.3.2...v6.3.3) (2021-04-24)
 
 

@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
 <dependency>
 <groupId>com.google.cloud</groupId>
 <artifactId>libraries-bom</artifactId>
-<version>20.1.0</version>
+<version>20.2.0</version>
 <type>pom</type>
 <scope>import</scope>
 </dependency>
@@ -38,25 +38,25 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
 <groupId>com.google.cloud</groupId>
 <artifactId>google-cloud-spanner</artifactId>
-<version>6.2.1</version>
+<version>6.4.0</version>
 </dependency>
 
 ```
 
 If you are using Gradle 5.x or later, add this to your dependencies
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:20.1.0')
+implementation platform('com.google.cloud:libraries-bom:20.2.0')
 
 compile 'com.google.cloud:google-cloud-spanner'
 ```
 If you are using Gradle without BOM, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-spanner:6.3.0'
+compile 'com.google.cloud:google-cloud-spanner:6.4.0'
 ```
 
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.3.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-spanner" % "6.4.0"
 ```
 
 ## Authentication

@@ -0,0 +1,7 @@
+# Security Policy
+
+To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
+
+The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
+
+We use g.co/vulnz for our intake, and do coordination and disclosure here using Security Advisory to privately discuss and fix the issue.

@@ -3,7 +3,7 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.google.cloud</groupId>
 <artifactId>google-cloud-spanner-bom</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
 <packaging>pom</packaging>
 <parent>
 <groupId>com.google.cloud</groupId>
@@ -64,43 +64,43 @@
 <dependency>
 <groupId>com.google.api.grpc</groupId>
 <artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
 </dependency>
 <dependency>
 <groupId>com.google.api.grpc</groupId>
 <artifactId>grpc-google-cloud-spanner-v1</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
 </dependency>
 <dependency>
 <groupId>com.google.api.grpc</groupId>
 <artifactId>proto-google-cloud-spanner-v1</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
 </dependency>
 <dependency>
 <groupId>com.google.api.grpc</groupId>
 <artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
 </dependency>
 <dependency>
 <groupId>com.google.cloud</groupId>
 <artifactId>google-cloud-spanner</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
 </dependency>
 <dependency>
 <groupId>com.google.cloud</groupId>
 <artifactId>google-cloud-spanner</artifactId>
 <type>test-jar</type>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
 </dependency>
 <dependency>
 <groupId>com.google.api.grpc</groupId>
 <artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
 </dependency>
 <dependency>
 <groupId>com.google.api.grpc</groupId>
 <artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
 </dependency>
 </dependencies>
 </dependencyManagement>

@@ -3,15 +3,15 @@
 <modelVersion>4.0.0</modelVersion>
 <groupId>com.google.cloud</groupId>
 <artifactId>google-cloud-spanner</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
 <packaging>jar</packaging>
 <name>Google Cloud Spanner</name>
 <url>https://.com/googleapis/java-spanner</url>
 <description>Java idiomatic client for Google Cloud Spanner.</description>
 <parent>
 <groupId>com.google.cloud</groupId>
 <artifactId>google-cloud-spanner-parent</artifactId>
-<version>6.3.4-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
+<version>6.4.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
 </parent>
 <properties>
 <site.installationModule>google-cloud-spanner</site.installationModule>

@@ -116,7 +116,7 @@ public static Type timestamp() {
 
 /**
 * Returns the descriptor for the {@code DATE} type: a timezone independent date in the range
-* [1678-01-01, 2262-01-01).
+* [0001-01-01, 9999-12-31).
 */
 public static Type date() {
 return TYPE_DATE;

@@ -1638,17 +1638,17 @@ private Value getValue(int fieldIndex) {
 Type elementType = fieldType.getArrayElementType();
 switch (elementType.getCode()) {
 case BOOL:
-return Value.boolArray(value.getBooleanArray(fieldIndex));
+return Value.boolArray(value.getBooleanList(fieldIndex));
 case INT64:
-return Value.int64Array(value.getLongArray(fieldIndex));
+return Value.int64Array(value.getLongList(fieldIndex));
 case STRING:
 return Value.stringArray(value.getStringList(fieldIndex));
 case JSON:
 return Value.jsonArray(value.getJsonList(fieldIndex));
 case BYTES:
 return Value.bytesArray(value.getBytesList(fieldIndex));
 case FLOAT64:
-return Value.float64Array(value.getDoubleArray(fieldIndex));
+return Value.float64Array(value.getDoubleList(fieldIndex));
 case NUMERIC:
 return Value.numericArray(value.getBigDecimalList(fieldIndex));
 case DATE:

@@ -166,6 +166,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.CancellationException;
@@ -493,7 +494,14 @@ public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCalla
 
 private static HeaderProvider headerProviderWithUserAgentFrom(HeaderProvider headerProvider) {
 final Map<String, String> headersWithUserAgent = new HashMap<>(headerProvider.getHeaders());
-final String userAgent = headersWithUserAgent.get(USER_AGENT_KEY);
+String userAgent = null;
+for (Entry<String, String> entry : headersWithUserAgent.entrySet()) {
+if (entry.getKey().equalsIgnoreCase(USER_AGENT_KEY)) {
+userAgent = entry.getValue();
+headersWithUserAgent.remove(entry.getKey());
+break;
+}
+}
 headersWithUserAgent.put(
 USER_AGENT_KEY,
 userAgent == null ? DEFAULT_USER_AGENT : userAgent + " " + DEFAULT_USER_AGENT);

@@ -1416,6 +1416,51 @@ public void testDatabaseOrInstanceIsDeletedAndThenRecreated() throws Exception {
 }
 }
 
+@Test
+public void testGetInvalidatedClientMultipleTimes() {
+StatusRuntimeException[] exceptions =
+new StatusRuntimeException[] {
+SpannerExceptionFactoryTest.newStatusResourceNotFoundException(
+"Database", SpannerExceptionFactory.DATABASE_RESOURCE_TYPE, DATABASE_NAME),
+SpannerExceptionFactoryTest.newStatusResourceNotFoundException(
+"Instance", SpannerExceptionFactory.INSTANCE_RESOURCE_TYPE, INSTANCE_NAME)
+};
+for (StatusRuntimeException exception : exceptions) {
+mockSpanner.setBatchCreateSessionsExecutionTime(
+SimulatedExecutionTime.ofStickyException(exception));
+try (Spanner spanner =
+SpannerOptions.newBuilder()
+.setProjectId(TEST_PROJECT)
+.setChannelProvider(channelProvider)
+.setCredentials(NoCredentials.getInstance())
+.setSessionPoolOption(SessionPoolOptions.newBuilder().setMinSessions(0).build())
+.build()
+.getService()) {
+for (int run = 0; run < 2; run++) {
+DatabaseClientImpl dbClient =
+(DatabaseClientImpl)
+spanner.getDatabaseClient(
+DatabaseId.of(TEST_PROJECT, TEST_INSTANCE, TEST_DATABASE));
+for (int useClient = 0; useClient < 2; useClient++) {
+// Using the same client multiple times should continue to return the same
+// ResourceNotFoundException, even though the session pool has been invalidated.
+try (ResultSet rs = dbClient.singleUse().executeQuery(SELECT1)) {
+rs.next();
+fail("missing expected exception");
+} catch (DatabaseNotFoundException | InstanceNotFoundException e) {
+// The server should only receive one BatchCreateSessions request for each run as we
+// have set MinSessions=0.
+assertThat(mockSpanner.getRequests()).hasSize(run + 1);
+assertThat(dbClient.pool.isValid()).isFalse();
+}
+}
+}
+}
+mockSpanner.reset();
+mockSpanner.removeAllExecutionTimes();
+}
+}
+
 @Test
 public void testAllowNestedTransactions() throws InterruptedException {
 final DatabaseClientImpl client =