Use exceptions

Signed-off-by: ahcorde <ahcorde@gmail.com>
ros · Jun 25, 2021 · 6a800a4 · 6a800a4
1 parent 58d57ed
commit 6a800a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/include/class_loader/class_loader.hpp b/include/class_loader/class_loader.hpp
@@ -122,16 +122,14 @@ class ClassLoader : public std::enable_shared_from_this<ClassLoader>
    * @return A std::shared_ptr<Base> to newly created plugin object
    */
   template<class Base>
-  std::shared_ptr<Base> createInstance(
-    const std::string & derived_class_name,
-    bool is_shared_ptr = false)
+  std::shared_ptr<Base> createInstance(const std::string & derived_class_name)
   {
-    if (is_shared_ptr) {
+    try {
       return std::shared_ptr<Base>(
         createRawInstance<Base>(derived_class_name, true),
         std::bind(&ClassLoader::onPluginDeletion<Base>, shared_from_this(), std::placeholders::_1)
       );
-    } else {
+    } catch (std::bad_weak_ptr & e) {  // This is not a shared_ptr
       return std::shared_ptr<Base>(
         createRawInstance<Base>(derived_class_name, true),
         std::bind(&ClassLoader::onPluginDeletion<Base>, this, std::placeholders::_1)
@@ -153,17 +151,15 @@ class ClassLoader : public std::enable_shared_from_this<ClassLoader>
    * @return A std::unique_ptr<Base> to newly created plugin object.
    */
   template<class Base>
-  UniquePtr<Base> createUniqueInstance(
-    const std::string & derived_class_name,
-    bool is_shared_ptr = false)
+  UniquePtr<Base> createUniqueInstance(const std::string & derived_class_name)
   {
     Base * raw = createRawInstance<Base>(derived_class_name, true);
-    if (is_shared_ptr) {
+    try {
       return std::unique_ptr<Base, DeleterType<Base>>(
         raw,
         std::bind(&ClassLoader::onPluginDeletion<Base>, shared_from_this(), std::placeholders::_1)
       );
-    } else {
+    } catch (std::bad_weak_ptr & e) {  // This is not a shared_ptr
       return std::unique_ptr<Base, DeleterType<Base>>(
         raw,
         std::bind(&ClassLoader::onPluginDeletion<Base>, this, std::placeholders::_1)

diff --git a/include/class_loader/multi_library_class_loader.hpp b/include/class_loader/multi_library_class_loader.hpp
@@ -105,7 +105,7 @@ class CLASS_LOADER_PUBLIC MultiLibraryClassLoader
               "was explicitly loaded through MultiLibraryClassLoader::loadLibrary()");
     }
 
-    return loader->createInstance<Base>(class_name, true);
+    return loader->createInstance<Base>(class_name);
   }
 
   /**
@@ -128,7 +128,7 @@ class CLASS_LOADER_PUBLIC MultiLibraryClassLoader
               "MultiLibraryClassLoader bound to library " + library_path +
               " Ensure you called MultiLibraryClassLoader::loadLibrary()");
     }
-    return loader->createInstance<Base>(class_name, true);
+    return loader->createInstance<Base>(class_name);
   }
 
   /// Creates an instance of an object of given class name with ancestor class Base
@@ -154,7 +154,7 @@ class CLASS_LOADER_PUBLIC MultiLibraryClassLoader
               "Make sure that the library exists and was explicitly loaded through "
               "MultiLibraryClassLoader::loadLibrary()");
     }
-    return loader->createUniqueInstance<Base>(class_name, true);
+    return loader->createUniqueInstance<Base>(class_name);
   }
 
   /// Creates an instance of an object of given class name with ancestor class Base
@@ -177,7 +177,7 @@ class CLASS_LOADER_PUBLIC MultiLibraryClassLoader
               "MultiLibraryClassLoader bound to library " + library_path +
               " Ensure you called MultiLibraryClassLoader::loadLibrary()");
     }
-    return loader->createUniqueInstance<Base>(class_name, true);
+    return loader->createUniqueInstance<Base>(class_name);
   }
 
   /**