From e49394bc6ce74f6b785100ab861d1f34ca044826 Mon Sep 17 00:00:00 2001
From: PapaCharlie <paul.chesnais@gmail.com>
Date: Wed, 4 Sep 2024 10:58:02 -0700
Subject: [PATCH] Fix type used during resubscribe

---
 d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java b/d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java
index 426a54ab39..b5ee6b0126 100644
--- a/d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java
+++ b/d2/src/main/java/com/linkedin/d2/xds/XdsClientImpl.java
@@ -705,6 +705,7 @@ public void run() {
           resources = resources.stream()
               .map(GlobCollectionUtils::globCollectionUrlForClusterResource)
               .collect(Collectors.toSet());
+          type = ResourceType.D2_URI;
         }
         _adsStream.sendDiscoveryRequest(type, resources);
       }
@@ -943,8 +944,8 @@ public void onCompleted()
     private void sendDiscoveryRequest(ResourceType type, Collection<String> resources)
     {
       _log.info("Sending {} request for resources: {}", type, resources);
-      DiscoveryRequestData request = new DiscoveryRequestData(_node, type, resources);
-      _requestWriter.onNext(request.toEnvoyProto());
+      DeltaDiscoveryRequest request = new DiscoveryRequestData(_node, type, resources).toEnvoyProto();
+      _requestWriter.onNext(request);
       _log.debug("Sent DiscoveryRequest\n{}", request);
     }