Add test and fix that repeated reconfigs works for schema changes.

2 files changed, 7 insertions, 11 deletions

diff --git a/config/src/vespa/config/retriever/configretriever.cpp b/config/src/vespa/config/retriever/configretriever.cpp
index 1d79e59c968..2056ae6351d 100644
--- a/config/src/vespa/config/retriever/configretriever.cpp
+++ b/config/src/vespa/config/retriever/configretriever.cpp
@@ -22,7 +22,7 @@ ConfigRetriever::ConfigRetriever(const ConfigKeySet & bootstrapSet,
 {
 }
 
-ConfigRetriever::~ConfigRetriever() {}
+ConfigRetriever::~ConfigRetriever() = default;
 
 ConfigSnapshot
 ConfigRetriever::getBootstrapConfigs(int timeoutInMillis)
@@ -50,11 +50,11 @@ ConfigRetriever::getConfigs(const ConfigKeySet & keySet, int timeoutInMillis)
             vespalib::LockGuard guard(_lock);
             if (_closed)
                 return ConfigSnapshot();
-            _configSubscriber.reset(new GenericConfigSubscriber(_context));
+            _configSubscriber = std::make_unique<GenericConfigSubscriber>(_context);
         }
         _subscriptionList.clear();
-        for (ConfigKeySet::const_iterator it(keySet.begin()), mt(keySet.end()); it != mt; it++) {
-            _subscriptionList.push_back(_configSubscriber->subscribe(*it, _subscribeTimeout));
+        for (const auto & key : keySet) {
+            _subscriptionList.push_back(_configSubscriber->subscribe(key, _subscribeTimeout));
         }
     }
     // Try update the subscribers generation if older than bootstrap
@@ -81,7 +81,7 @@ ConfigRetriever::close()
     vespalib::LockGuard guard(_lock);
     _closed = true;
     _bootstrapSubscriber.close();
-    if (_configSubscriber.get() != NULL)
+    if (_configSubscriber)
         _configSubscriber->close();
 }
 
diff --git a/config/src/vespa/config/retriever/configsnapshot.cpp b/config/src/vespa/config/retriever/configsnapshot.cpp
index 7a095cacc3c..c5246aab9c9 100644
--- a/config/src/vespa/config/retriever/configsnapshot.cpp
+++ b/config/src/vespa/config/retriever/configsnapshot.cpp
@@ -21,13 +21,9 @@ ConfigSnapshot::ConfigSnapshot()
         : _valueMap(),
           _generation(0) {}
 
-ConfigSnapshot::~ConfigSnapshot() {
-}
+ConfigSnapshot::~ConfigSnapshot() = default;
 
-ConfigSnapshot::ConfigSnapshot(const ConfigSnapshot &rhs) :
-        _valueMap(rhs._valueMap),
-        _generation(rhs._generation) {
-}
+ConfigSnapshot::ConfigSnapshot(const ConfigSnapshot &rhs) = default;
 
 ConfigSnapshot &
 ConfigSnapshot::operator=(const ConfigSnapshot &rhs) {