Make variable local

source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp

@@ -95,11 +95,12 @@ namespace armarx::armem::server::obj
     {
         // onConnect can be called multiple times, but addRobot will fail if called more than once with the same ID
         // So we need to always make sure to guard a call to addRobot
-        if (!RobotState::hasRobot("robot"))
-        {
-            robot = RobotState::addRobot("robot", VirtualRobot::RobotIO::RobotDescription::eStructure);
-        }
-        robotStateComponent = getRobotStateComponent();
+        const std::string robotKey = "robot";
+        VirtualRobot::RobotPtr robot = RobotState::hasRobot(robotKey)
+                                       ? RobotState::getRobot(robotKey)
+                                       : RobotState::addRobot(robotKey, VirtualRobot::RobotIO::RobotDescription::eStructure);
+
+        robotStateComponent = RobotState::getRobotStateComponent();
 
         getProxyFromProperty(kinematicUnitObserver, "cmp.KinematicUnitObserverName", false, "", false);
 

source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h

@@ -106,9 +106,6 @@ namespace armarx::armem::server::obj
         RobotStateComponentInterfacePrx robotStateComponent;
         KinematicUnitObserverInterfacePrx kinematicUnitObserver;
 
-        VirtualRobot::RobotPtr robot;
-
-
         clazz::Segment classSegment;