Potential fix

Author: shaoltan-amazon

src/lib/dnssd/Resolver_ImplMinimalMdns.cpp

@@ -271,17 +271,7 @@ class MinMdnsResolver : public Resolver, public MdnsPacketDelegate
     {
         GlobalMinimalMdnsServer::Instance().SetResponseDelegate(this);
     }
-    ~MinMdnsResolver() 
-    { 
-        // SHAO added
-        // Remove this instance as the response delegate
-        if (GlobalMinimalMdnsServer::Server().IsListening()) 
-        {
-            GlobalMinimalMdnsServer::Instance().SetResponseDelegate(nullptr);
-        }
-        //
-        SetDiscoveryContext(nullptr); 
-    }
+    ~MinMdnsResolver() { SetDiscoveryContext(nullptr); }
 
     //// MdnsPacketDelegate implementation
     void OnMdnsPacketData(const BytesRange & data, const chip::Inet::IPPacketInfo * info) override;
@@ -511,6 +501,7 @@ void MinMdnsResolver::AdvancePendingResolverStates()
 
 void MinMdnsResolver::OnMdnsPacketData(const BytesRange & data, const chip::Inet::IPPacketInfo * info)
 {
+    ChipLogProgress(Discovery, "SHAO we are here 1");
     MATTER_TRACE_SCOPE("Received MDNS Packet", "MinMdnsResolver");
 
     // Fill up any relevant data

src/platform/Linux/bluez/BluezAdvertisement.cpp

@@ -119,10 +119,24 @@ CHIP_ERROR BluezAdvertisement::Init(BluezAdapter1 * apAdapter, const char * aAdv
     GAutoPtr<char> rootPath;
     g_object_get(G_OBJECT(mEndpoint.GetGattApplicationObjectManager()), "object-path", &rootPath.GetReceiver(), nullptr);
     g_snprintf(mAdvPath, sizeof(mAdvPath), "%s/advertising", rootPath.get());
-    g_strlcpy(mAdvUUID, aAdvUUID, sizeof(mAdvUUID));
+    
+    // SHAO
+    // ChipLogProgress(DeviceLayer, "SHAO HI!");
+    //
+    // g_strlcpy(mAdvUUID, aAdvUUID, sizeof(mAdvUUID)); // SHAO OG
+    // SHAO added
+    if (aAdvUUID != nullptr)
+    {
+        // ChipLogProgress(DeviceLayer, "SHAO HOI!!");
+        g_strlcpy(mAdvUUID, aAdvUUID, sizeof(mAdvUUID));
+    }
+    //
 
     if (aAdvName != nullptr)
     {
+        // SHAO
+        // ChipLogProgress(DeviceLayer, "SHAO HELLO!");
+        //
         g_strlcpy(mAdvName, aAdvName, sizeof(mAdvName));
     }
     else