address review comments: fix useTransportSecurity

grpc · Nov 18, 2020 · d52274b · d52274b
1 parent a07fab8
commit d52274b
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/XdsServerBuilder.java b/xds/src/main/java/io/grpc/xds/XdsServerBuilder.java
@@ -118,13 +118,21 @@ public XdsServerBuilder fallbackHandlerRegistry(@Nullable HandlerRegistry fallba
 
   @Override
   public XdsServerBuilder useTransportSecurity(File certChain, File privateKey) {
-    delegate.useTransportSecurity(certChain, privateKey);
+    try {
+      this.serverCredentials = TlsServerCredentials.create(certChain, privateKey);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
     return this;
   }
 
   @Override
   public XdsServerBuilder useTransportSecurity(InputStream certChain, InputStream privateKey) {
-    delegate.useTransportSecurity(certChain, privateKey);
+    try {
+      this.serverCredentials = TlsServerCredentials.create(certChain, privateKey);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
     return this;
   }
 
@@ -134,7 +142,7 @@ public XdsServerBuilder useTransportSecurity(InputStream certChain, InputStream
    */
   @ExperimentalApi("https://github.com/grpc/grpc-java/issues/7514")
   public XdsServerBuilder useXdsSecurityWithPlaintextFallback() {
-    this.serverCredentials = InsecureServerCredentials.create();
+    this.serverCredentials = XdsServerCredentials.create(InsecureServerCredentials.create());
     return this;
   }