From 3e17011087cfae3f3cbb9028cff35bf1d7a61e55 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Tue, 22 Mar 2022 17:42:56 +0100
Subject: [PATCH] small tweaks for local datapool code

---
 src/fsfw/datapoollocal/LocalPoolObjectBase.cpp | 11 ++++++-----
 src/fsfw/datapoollocal/StaticLocalDataSet.h    |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/fsfw/datapoollocal/LocalPoolObjectBase.cpp b/src/fsfw/datapoollocal/LocalPoolObjectBase.cpp
index c974601cc..82aefc18c 100644
--- a/src/fsfw/datapoollocal/LocalPoolObjectBase.cpp
+++ b/src/fsfw/datapoollocal/LocalPoolObjectBase.cpp
@@ -47,13 +47,14 @@ LocalPoolObjectBase::LocalPoolObjectBase(object_id_t poolOwner, lp_id_t poolId,
   HasLocalDataPoolIF* hkOwner = ObjectManager::instance()->get<HasLocalDataPoolIF>(poolOwner);
   if (hkOwner == nullptr) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-    sif::error << "LocalPoolVariable: The supplied pool owner did not implement the correct "
-                  "interface HasLocalDataPoolIF!"
-               << std::endl;
+    sif::error << "LocalPoolVariable: The supplied pool owner 0x" << std::hex << poolOwner
+               << std::dec << " did not implement the correct interface "
+               << "HasLocalDataPoolIF" << std::endl;
 #else
     sif::printError(
-        "LocalPoolVariable: The supplied pool owner did not implement the correct "
-        "interface HasLocalDataPoolIF!\n");
+        "LocalPoolVariable: The supplied pool owner 0x%08x did not implement the correct "
+        "interface HasLocalDataPoolIF\n",
+        poolOwner);
 #endif
     return;
   }
diff --git a/src/fsfw/datapoollocal/StaticLocalDataSet.h b/src/fsfw/datapoollocal/StaticLocalDataSet.h
index dd264e582..59047d67b 100644
--- a/src/fsfw/datapoollocal/StaticLocalDataSet.h
+++ b/src/fsfw/datapoollocal/StaticLocalDataSet.h
@@ -46,7 +46,7 @@ class StaticLocalDataSet : public LocalPoolDataSetBase {
   }
 
  private:
-  std::array<PoolVariableIF*, NUM_VARIABLES> poolVarList;
+  std::array<PoolVariableIF*, NUM_VARIABLES> poolVarList = {};
 };
 
 #endif /* FSFW_DATAPOOLLOCAL_STATICLOCALDATASET_H_ */