From 53f4ad21b4893d2ebbd7b34deb5c60dbe97c1e1a Mon Sep 17 00:00:00 2001
From: Carl Mastrangelo <notcarl@google.com>
Date: Mon, 25 Mar 2019 16:10:13 -0700
Subject: [PATCH] core: fix DNS JNDI not working if there is an unavailability
 cause

---
 core/src/main/java/io/grpc/internal/DnsNameResolver.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/src/main/java/io/grpc/internal/DnsNameResolver.java b/core/src/main/java/io/grpc/internal/DnsNameResolver.java
index f987ede291..956786dce1 100644
--- a/core/src/main/java/io/grpc/internal/DnsNameResolver.java
+++ b/core/src/main/java/io/grpc/internal/DnsNameResolver.java
@@ -693,6 +693,7 @@ final class DnsNameResolver extends NameResolver {
           Level.FINE,
           "JndiResourceResolverFactory not available, skipping.",
           rrf.unavailabilityCause());
+      return null;
     }
     return rrf;
   }