Use early return, let callbacks handle exceptions

Author: autumn-mck

Framework/Core/include/Framework/DataAllocator.h

@@ -115,31 +115,30 @@ struct LifetimeHolder {
   // invoke the callback early (e.g. for the Product<> case)
   void release()
   {
-    if (ptr) {
-      auto* released = ptr;
-      ptr = nullptr;
-      auto releaseCallback = std::move(callback);
-      if (releaseCallback) {
-        try {
-          releaseCallback(*released);
-        } catch (...) {
-          delete released;
-          throw;
-        }
-      }
-      delete released;
+    if (!ptr) {
+      return;
+    }
+
+    std::unique_ptr<T> released{ptr};
+    ptr = nullptr;
+    auto releaseCallback = std::move(callback);
+    if (!releaseCallback) {
+      return;
     }
+    releaseCallback(*released);
   }
 
   // Delete the owned object without invoking the release callback. This is used
   // when a partially filled object must be abandoned.
   void discard()
   {
-    if (ptr) {
-      callback = nullptr;
-      delete ptr;
-      ptr = nullptr;
+    if (!ptr) {
+      return;
     }
+
+    callback = nullptr;
+    delete ptr;
+    ptr = nullptr;
   }
 };