Use renamed macros + minor fix

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

Author: ivanpauno

rcljava/src/main/cpp/org_ros2_rcljava_graph_EndpointInfo.cpp

@@ -35,29 +35,29 @@ Java_org_ros2_rcljava_graph_EndpointInfo_nativeFromRCL(JNIEnv * env, jobject sel
     "Lorg/ros2/rcljava/graph/EndpointInfo$EndpointType;";
   // TODO(ivanpauno): class and field lookup could be done at startup time
   jclass endpoint_type_clazz = env->FindClass("org/ros2/rcljava/graph/EndpointInfo$EndpointType");
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   jclass clazz = env->GetObjectClass(self);
   jfieldID node_name_fid = env->GetFieldID(clazz, "nodeName", "Ljava/lang/String;");
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   jfieldID node_namespace_fid = env->GetFieldID(clazz, "nodeNamespace", "Ljava/lang/String;");
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   jfieldID topic_type_fid = env->GetFieldID(clazz, "topicType", "Ljava/lang/String;");
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   jfieldID endpoint_type_fid = env->GetFieldID(clazz, "endpointType", endpoint_type_enum_path);
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   jfieldID endpoint_gid_fid = env->GetFieldID(clazz, "endpointGID", "[B");
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   jfieldID qos_fid = env->GetFieldID(clazz, "qos", "Lorg/ros2/rcljava/qos/QoSProfile;");
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
 
   jstring jnode_name = env->NewStringUTF(p->node_name);
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   env->SetObjectField(self, node_name_fid, jnode_name);
   jstring jnode_namespace = env->NewStringUTF(p->node_namespace);
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   env->SetObjectField(self, node_namespace_fid, jnode_namespace);
   jstring jtopic_type = env->NewStringUTF(p->topic_type);
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   env->SetObjectField(self, topic_type_fid, jtopic_type);
   jfieldID enum_value_fid;
   switch (p->endpoint_type) {
@@ -78,7 +78,7 @@ Java_org_ros2_rcljava_graph_EndpointInfo_nativeFromRCL(JNIEnv * env, jobject sel
         env, "java/lang/IllegalArgumentException", "unknown endpoint type");
       break;
   }
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   jobject enum_value = env->GetStaticObjectField(endpoint_type_clazz, enum_value_fid);
   env->SetObjectField(self, endpoint_type_fid, enum_value);
   jbyteArray jgid = env->NewByteArray(RMW_GID_STORAGE_SIZE);
@@ -88,17 +88,17 @@ Java_org_ros2_rcljava_graph_EndpointInfo_nativeFromRCL(JNIEnv * env, jobject sel
     return;
   }
   jbyte * gid_content = env->GetByteArrayElements(jgid, nullptr);
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   for (size_t i = 0; i < RMW_GID_STORAGE_SIZE; ++i) {
     gid_content[i] = p->endpoint_gid[i];
   }
   env->ReleaseByteArrayElements(jgid, gid_content, 0);
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   env->SetObjectField(self, endpoint_gid_fid, jgid);
   jclass qos_clazz = env->FindClass("org/ros2/rcljava/qos/QoSProfile");
   jmethodID qos_init_mid = env->GetMethodID(qos_clazz, "<init>", "()V");
   jobject jqos = env->NewObject(qos_clazz, qos_init_mid);
-  RCLJAVA_COMMON_EXCEPTION_CHECK(env);
+  RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env);
   jmethodID qos_from_rcl_mid = env->GetMethodID(qos_clazz, "nativeFromRCL", "(J)V");
   env->CallObjectMethod(jqos, qos_from_rcl_mid, &p->qos_profile);
   env->SetObjectField(self, qos_fid, jqos);

rcljava/src/main/cpp/org_ros2_rcljava_node_NodeImpl.cpp

@@ -283,14 +283,14 @@ Java_org_ros2_rcljava_node_NodeImpl_nativeGetPublishersInfo(
   {
     jclass list_clazz = env->GetObjectClass(jpublishers_info);
     jmethodID list_add_mid = env->GetMethodID(list_clazz, "add", "(Ljava/lang/Object;)Z");
-    RCLJAVA_COMMON_EXCEPTION_CHECK_X(env, goto cleanup);
+    RCLJAVA_COMMON_CHECK_FOR_EXCEPTION_WITH_ERROR_STATEMENT(env, goto cleanup);
     jclass endpoint_info_clazz = env->FindClass("org/ros2/rcljava/graph/EndpointInfo");
-    RCLJAVA_COMMON_EXCEPTION_CHECK_X(env, goto cleanup);
+    RCLJAVA_COMMON_CHECK_FOR_EXCEPTION_WITH_ERROR_STATEMENT(env, goto cleanup);
     jmethodID endpoint_info_init_mid = env->GetMethodID(endpoint_info_clazz, "<init>", "()V");
-    RCLJAVA_COMMON_EXCEPTION_CHECK_X(env, goto cleanup);
+    RCLJAVA_COMMON_CHECK_FOR_EXCEPTION_WITH_ERROR_STATEMENT(env, goto cleanup);
     jmethodID endpoint_info_from_rcl_mid = env->GetMethodID(
       endpoint_info_clazz, "nativeFromRCL", "(J)V");
-    RCLJAVA_COMMON_EXCEPTION_CHECK_X(env, goto cleanup);
+    RCLJAVA_COMMON_CHECK_FOR_EXCEPTION_WITH_ERROR_STATEMENT(env, goto cleanup);
 
     for (size_t i = 0; i < publishers_info.size; i++) {
       jobject item = env->NewObject(endpoint_info_clazz, endpoint_info_init_mid);
@@ -304,5 +304,7 @@ Java_org_ros2_rcljava_node_NodeImpl_nativeGetPublishersInfo(
 // instead of C style error handling (?).
 cleanup:
   ret = rcl_topic_endpoint_info_array_fini(&publishers_info, &allocator);
-  RCLJAVA_COMMON_THROW_FROM_RCL(env, ret, "failed to destroy rcl publisher info");
+  if (!env->ExceptionCheck() && RCL_RET_OK != ret) {
+    rcljava_throw_rclexception(env, ret, "failed to destroy rcl publisher info");
+  }
 }