Skip to content

Commit 217737b

Browse files
committed
address comments.
1 parent e35914f commit 217737b

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

gax-java/gax-grpc/src/main/java/com/google/api/gax/grpc/InstantiatingGrpcChannelProvider.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,9 +569,22 @@ ChannelCredentials createMtlsToS2AChannelCredentials(
569569
return null;
570570
}
571571
AdvancedTlsX509KeyManager keyManager = new AdvancedTlsX509KeyManager();
572-
keyManager.updateIdentityCredentials(certChain, privateKey);
572+
ScheduledExecutorService keyManagerExecutor = Executors.newSingleThreadScheduledExecutor(
573+
r -> {
574+
Thread t = new Thread(r, "s2a-key-manager-updater");
575+
t.setDaemon(true);
576+
return t;
577+
});
578+
579+
keyManager.updateIdentityCredentials(certChain, privateKey, 1, TimeUnit.HOURS, keyManagerExecutor);
573580
AdvancedTlsX509TrustManager trustManager = AdvancedTlsX509TrustManager.newBuilder().build();
574-
ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
581+
ScheduledExecutorService trustManagerExecutor = Executors.newSingleThreadScheduledExecutor(
582+
r -> {
583+
Thread t = new Thread(r, "s2a-trust-manager-updater");
584+
t.setDaemon(true);
585+
return t;
586+
});
587+
575588
trustManager.updateTrustCredentials(trustBundle, 1, TimeUnit.HOURS, executor);
576589
return TlsChannelCredentials.newBuilder()
577590
.keyManager(keyManager)

0 commit comments

Comments
 (0)