wait for future before dtor

VERSION

@@ -1 +1 @@
-5.11.109
+5.11.110

src/fdb5/remote/client/ClientConnection.cc

@@ -155,6 +155,10 @@ void ClientConnection::disconnect() {
     ASSERT(clients_.empty());
     if (connected_) {
 
+        if (dataWriteFuture_.valid()) {
+            dataWriteFuture_.wait();
+        }
+
         if (listeningControlThread_.joinable()) {
             listeningControlThread_.join();
         }

src/fdb5/remote/server/ServerConnection.cc

@@ -80,6 +80,10 @@ ServerConnection::~ServerConnection() {
     // We don't want to die before the worker threads are cleaned up
     waitForWorkers();
 
+    if (archiveFuture_.valid()) {
+        archiveFuture_.wait();
+    }
+
     eckit::Log::info() << "Done" << std::endl;
 }
 
@@ -363,7 +367,6 @@ size_t ServerConnection::archiveThreadLoop() {
 void ServerConnection::listeningThreadLoopData() {
 
     MessageHeader hdr;
-    uint32_t archiverID;
 
     try {
 

src/fdb5/remote/server/StoreHandler.cc

@@ -170,15 +170,12 @@ void StoreHandler::archiveBlob(const uint32_t clientID, const uint32_t requestID
 
     Store& ss = store(clientID, dbKey);
 
-    auto futureLocation = ss.archive(idxKey, charData + s.position(), length - s.position());
+    std::unique_ptr<FieldLocation> location = ss.archive(idxKey, charData + s.position(), length - s.position());
     Log::status() << "Archiving done: " << ss_key.str() << std::endl;
 
-    auto loc = futureLocation.get();
-
     eckit::Buffer buffer(16 * 1024);
     MemoryStream stream(buffer);
-//    stream << archiverID;
-    stream << (*loc);
+    stream << (*location);
     Connection::write(Message::Store, true, clientID, requestID, buffer, stream.position());
 }