Turning assert into real exception

STEllAR-GROUP · May 15, 2017 · da5d22c · da5d22c
1 parent 1d2b747
commit da5d22c
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/src/runtime/actions/detail/action_factory.cpp b/src/runtime/actions/detail/action_factory.cpp
@@ -129,20 +129,34 @@ namespace hpx { namespace actions { namespace detail
 
         if (id >= this_.cache_.size())
         {
-            std::string msg(
-                "Unknown type desciptor " + std::to_string(id));
+            std::string msg("Unknown type descriptor " + std::to_string(id));
 #if defined(HPX_DEBUG)
             if (name != nullptr)
             {
-                msg += ", for typename " + *name + "\n";
-                msg += this_.collect_registered_typenames();
+                msg += ", for typename " + *name;
             }
+            msg += this_.collect_registered_typenames();
 #endif
             HPX_THROW_EXCEPTION(serialization_error,
                 "action_registry::create", msg);
+            return nullptr;
         }
+
         ctor_t ctor = this_.cache_[id];
-        HPX_ASSERT(ctor != nullptr);
+        if (ctor != nullptr)
+        {
+            std::string msg("Unknown type descriptor " + std::to_string(id));
+#if defined(HPX_DEBUG)
+            if (name != nullptr)
+            {
+                msg += ", for typename " + *name;
+            }
+            msg += this_.collect_registered_typenames();
+#endif
+            HPX_THROW_EXCEPTION(serialization_error,
+                "action_registry::create", msg);
+            return nullptr;
+        }
         return ctor(with_continuation);
     }