Improve the macro

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Author: ivanpauno

rcljava_common/include/rcljava_common/exceptions.hpp

@@ -40,15 +40,21 @@
 /// Call \ref rcljava_throw_rclexception if \a ret is not RCL_RET_OK,
 /// and execute \a error_statement in that case.
 /**
+ * The rcl error message will be added to \a base_message, and the rcl error state will be reset.
+ * 
  * \param env a JNIEnv pointer, used to throw a java exception from the rcl error.
  * \param ret rcl_ret_t error that will be checked.
  * \param message error message that will be passed to the thrown exception.
+ *  The complete error will be "${message}: ${rcl_error_string}".
+ *  \a message can be either a `const char *` or as `std::string`.
  * \param error_statement statement executed if ret was not RCL_RET_OK.
  */
-#define RCLJAVA_COMMON_THROW_FROM_RCL_X(env, ret, message, error_statement) \
+#define RCLJAVA_COMMON_THROW_FROM_RCL_X(env, ret, base_message, error_statement) \
   do { \
     if (RCL_RET_OK != ret) { \
-      rcljava_common::exception::rcljava_throw_rclexception(env, ret, message); \
+      rcljava_common::exception::rcljava_throw_rclexception( \
+        env, ret, static_cast<std::string>(message) + ": " + rcl_get_error_string().str); \
+      rcl_reset_error();
       error_statement; \
     } \
   } while (0)