Continue with issue #80:

- remove "void ExceptionHandlingDecorator::setDataValidity(DataValidity newValidity)"
- add "void ExceptionHandlingDecorator::setOwner(EntityOwner* owner)" and remove owner setting in constructor

include/ExceptionHandlingDecorator.h

@@ -19,8 +19,8 @@ namespace ChimeraTK {
   class ExceptionHandlingDecorator : public ChimeraTK::NDRegisterAccessorDecorator<UserType> {
    public:
     ExceptionHandlingDecorator(
-        boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> accessor, DeviceModule& devMod, EntityOwner* owner)
-    : ChimeraTK::NDRegisterAccessorDecorator<UserType>(accessor), deviceModule(devMod), _owner(owner) {}
+        boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> accessor, DeviceModule& devMod)
+    : ChimeraTK::NDRegisterAccessorDecorator<UserType>(accessor), deviceModule(devMod) {}
 
     bool doWriteTransfer(ChimeraTK::VersionNumber versionNumber = {}) override;
 
@@ -43,16 +43,16 @@ namespace ChimeraTK {
 
     DataValidity dataValidity() const override;
 
-    void setDataValidity(DataValidity validity = DataValidity::ok) override;
-
     void interrupt() override;
 
+    void setOwner(EntityOwner* owner);
+    
    protected:
     DeviceModule& deviceModule;
     DataValidity validity{DataValidity::ok};
     bool genericTransfer(std::function<bool(void)> callable, bool invalidateOnFailure = true);
     void setOwnerValidity(DataValidity newValidity);
-    EntityOwner* _owner;
+    EntityOwner* _owner = {nullptr};
   };
 
   DECLARE_TEMPLATE_FOR_CHIMERATK_USER_TYPES(ExceptionHandlingDecorator);

src/Application.cc

@@ -358,7 +358,7 @@ boost::shared_ptr<ChimeraTK::NDRegisterAccessor<UserType>> Application::createDe
   assert(devmod != nullptr);
 
   // decorate the accessor with a ExceptionHandlingDecorator and return it
-  return boost::make_shared<ExceptionHandlingDecorator<UserType>>(accessor, *devmod, nullptr);
+  return boost::make_shared<ExceptionHandlingDecorator<UserType>>(accessor, *devmod);
 }
 
 /*********************************************************************************************************************/

src/ExceptionHandlingDecorator.cc

@@ -7,20 +7,19 @@ constexpr useconds_t DeviceOpenTimeout = 500;
 
 namespace ChimeraTK {
 
-    template<typename UserType>
-    void ExceptionHandlingDecorator<UserType>::setOwnerValidity(DataValidity newValidity) {
-        if (newValidity != validity) {
-            validity = newValidity; 
-            if (!_owner) return; // hack to deal with null ptr until it filled correctly
-            if (newValidity == DataValidity::faulty) {
-                _owner->incrementDataFaultCounter();
-            } else {
-                _owner->decrementDataFaultCounter();
-            }
-        }
+  template<typename UserType>
+  void ExceptionHandlingDecorator<UserType>::setOwnerValidity(DataValidity newValidity) {
+    if (newValidity != validity) {
+      validity = newValidity;
+      if (!_owner) return;
+      if (newValidity == DataValidity::faulty) {
+        _owner->incrementDataFaultCounter();
+      } else {
+        _owner->decrementDataFaultCounter();
+      }
     }
-    
-    
+  }
+  
   template<typename UserType>
   bool ExceptionHandlingDecorator<UserType>::genericTransfer(
     std::function<bool(void)> callable, bool updateOwnerValidityFlag) {
@@ -30,9 +29,9 @@ namespace ChimeraTK {
       setOwnerValidityFunction = std::bind(&ExceptionHandlingDecorator<UserType>::setOwnerValidity, this, std::placeholders::_1);
     } 
     else {
-      setOwnerValidityFunction = [](DataValidity) {}; // do nothing if user does
-                                                     // not want to invalidate data.
+      setOwnerValidityFunction = [](DataValidity) {}; // do nothing if user does                                               // not want to invalidate data.
     }
+    
     while(true) {
       try {
         if(!deviceModule.device.isOpened()) {
@@ -131,22 +130,18 @@ namespace ChimeraTK {
     return validity;
   }
 
-  template<typename UserType>
-  void ExceptionHandlingDecorator<UserType>::setDataValidity(DataValidity newValidity) {
-    // Remember ourselves, but also pass down the line
-    if(newValidity != validity) {
-      validity = newValidity;
-      ChimeraTK::NDRegisterAccessorDecorator<UserType>::setDataValidity(validity);
-    }
-  }
-
   template<typename UserType>
   void ExceptionHandlingDecorator<UserType>::interrupt() {
     // notify the condition variable waiting in reportException of the genericTransfer
     deviceModule.notify();
     ChimeraTK::NDRegisterAccessorDecorator<UserType>::interrupt();
   }
-
+  
+  template<typename UserType>
+  void ExceptionHandlingDecorator<UserType>::setOwner(EntityOwner* owner) {
+    _owner = owner;
+  }
+  
   INSTANTIATE_TEMPLATE_FOR_CHIMERATK_USER_TYPES(ExceptionHandlingDecorator);
 
 } /* namespace ChimeraTK */