From 7a7813b1b8b6ac02ad8016d9c5f32031f2d7a795 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 20 Aug 2015 08:48:06 +0300
Subject: [PATCH] BareMetal: Do not add a duplicate entry for GDB server
 provider

In case the SDK settings contain some host which was imported, and the server
provider was modified to a different host, it is re-imported on next execution
of Creator.

Also fix a potential memory leak when registration fails.

Change-Id: I96d087ab35e0dc54975768c4bc697218080049ae
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/plugins/baremetal/baremetaldevice.cpp     | 22 +++++++++++++------
 .../baremetal/gdbserverprovidermanager.cpp    |  8 +++++++
 .../baremetal/gdbserverprovidermanager.h      |  1 +
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp
index daa93d5eb39..b32bbc62708 100644
--- a/src/plugins/baremetal/baremetaldevice.cpp
+++ b/src/plugins/baremetal/baremetaldevice.cpp
@@ -79,13 +79,21 @@ void BareMetalDevice::fromMap(const QVariantMap &map)
     IDevice::fromMap(map);
     QString gdbServerProvider = map.value(QLatin1String(gdbServerProviderIdKeyC)).toString();
     if (gdbServerProvider.isEmpty()) {
-        const QSsh::SshConnectionParameters sshParams = sshParameters();
-        DefaultGdbServerProvider *newProvider = new DefaultGdbServerProvider;
-        newProvider->setDisplayName(displayName());
-        newProvider->m_host = sshParams.host;
-        newProvider->m_port = sshParams.port;
-        GdbServerProviderManager::instance()->registerProvider(newProvider);
-        gdbServerProvider = newProvider->id();
+        const QString name = displayName();
+        if (GdbServerProvider *provider =
+                GdbServerProviderManager::instance()->findByDisplayName(name)) {
+            gdbServerProvider = provider->id();
+        } else {
+            const QSsh::SshConnectionParameters sshParams = sshParameters();
+            DefaultGdbServerProvider *newProvider = new DefaultGdbServerProvider;
+            newProvider->setDisplayName(name);
+            newProvider->m_host = sshParams.host;
+            newProvider->m_port = sshParams.port;
+            if (GdbServerProviderManager::instance()->registerProvider(newProvider))
+                gdbServerProvider = newProvider->id();
+            else
+                delete newProvider;
+        }
     }
     setGdbServerProviderId(gdbServerProvider);
 }
diff --git a/src/plugins/baremetal/gdbserverprovidermanager.cpp b/src/plugins/baremetal/gdbserverprovidermanager.cpp
index 5f0e8d88811..84207afdae0 100644
--- a/src/plugins/baremetal/gdbserverprovidermanager.cpp
+++ b/src/plugins/baremetal/gdbserverprovidermanager.cpp
@@ -172,6 +172,14 @@ GdbServerProvider *GdbServerProviderManager::findProvider(const QString &id) con
     return Utils::findOrDefault(m_providers, Utils::equal(&GdbServerProvider::id, id));
 }
 
+GdbServerProvider *GdbServerProviderManager::findByDisplayName(const QString &displayName) const
+{
+    if (displayName.isEmpty())
+        return 0;
+
+    return Utils::findOrDefault(m_providers, Utils::equal(&GdbServerProvider::displayName, displayName));
+}
+
 void GdbServerProviderManager::notifyAboutUpdate(GdbServerProvider *provider)
 {
     if (!provider || !m_providers.contains(provider))
diff --git a/src/plugins/baremetal/gdbserverprovidermanager.h b/src/plugins/baremetal/gdbserverprovidermanager.h
index e510feed8f1..56a98dd5883 100644
--- a/src/plugins/baremetal/gdbserverprovidermanager.h
+++ b/src/plugins/baremetal/gdbserverprovidermanager.h
@@ -56,6 +56,7 @@ public:
     QList<GdbServerProvider *> providers() const;
     QList<GdbServerProviderFactory *> factories() const;
     GdbServerProvider *findProvider(const QString &id) const;
+    GdbServerProvider *findByDisplayName(const QString &displayName) const;
     bool registerProvider(GdbServerProvider *);
     void deregisterProvider(GdbServerProvider *);