Skip to content

Commit

Permalink
Mqtt5 jni fixes (#589)
Browse files Browse the repository at this point in the history 
* Update some JNI calls to account for return type
* Update submodule to pull in ut8 validation and reconnect delay fix
  • Loading branch information
@bretambrose
bretambrose committed Feb 8, 2023
1 parent 8bcb667 commit b285819
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion crt/aws-c-mqtt
Submodule aws-c-mqtt updated 20 files
+31 −0 include/aws/mqtt/client.h
+1 −0 include/aws/mqtt/mqtt.h
+2 −1 include/aws/mqtt/private/client_impl.h
+90 −0 include/aws/mqtt/private/v5/mqtt5_callbacks.h
+6 −0 include/aws/mqtt/private/v5/mqtt5_client_impl.h
+8 −0 include/aws/mqtt/private/v5/mqtt5_utils.h
+7 −0 include/aws/mqtt/v5/mqtt5_client.h
+85 −0 include/aws/mqtt/v5/mqtt5_listener.h
+36 −19 source/client.c
+159 −0 source/v5/mqtt5_callbacks.c
+23 −31 source/v5/mqtt5_client.c
+121 −0 source/v5/mqtt5_listener.c
+91 −0 source/v5/mqtt5_options_storage.c
+35 −0 source/v5/mqtt5_utils.c
+25 −0 tests/CMakeLists.txt
+146 −0 tests/v3/connection_state_test.c
+241 −4 tests/v5/mqtt5_client_tests.c
+4 −4 tests/v5/mqtt5_operation_and_storage_tests.c
+244 −0 tests/v5/mqtt5_operation_validation_failure_tests.c
+150 −0 tests/v5/mqtt5_utils_tests.c
23 changes: 11 additions & 12 deletions src/native/mqtt5_client.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ static int s_set_int_enum_in_packet(
if (*int_enum < 0) {
return AWS_OP_ERR;
}
(*env)->CallIntMethod(env, packet, set_enum_field_id, (jint)*int_enum);
(*env)->CallVoidMethod(env, packet, set_enum_field_id, (jint)*int_enum);
if (aws_jni_check_and_clear_exception(env)) {
return AWS_OP_ERR;
}
Expand Down Expand Up @@ -539,7 +539,7 @@ static jobject s_aws_mqtt5_client_create_jni_connack_packet_from_native(
AWS_LOGF_ERROR(AWS_LS_MQTT_CLIENT, "Error when creating ConnAckPacket from native: Reason code is negative!");
return NULL;
}
(*env)->CallIntMethod(
(*env)->CallVoidMethod(
env, connack_data, mqtt5_connack_packet_properties.connack_native_add_reason_code_id, (jint)reason_code_int);

/* Set all of the optional data in Java classes */
Expand Down Expand Up @@ -753,7 +753,7 @@ static jobject s_aws_mqtt5_client_create_jni_negotiated_settings_from_native(
mqtt5_negotiated_settings_properties.negotiated_settings_class,
mqtt5_negotiated_settings_properties.negotiated_settings_constructor_id);

(*env)->CallObjectMethod(
(*env)->CallVoidMethod(
env,
negotiated_settings_data,
mqtt5_negotiated_settings_properties.negotiated_settings_native_set_qos_id,
Expand Down Expand Up @@ -1123,7 +1123,7 @@ static void s_aws_mqtt5_client_java_lifecycle_event(const struct aws_mqtt5_clien
mqtt5_on_attempting_connect_return_properties.return_constructor_id);
aws_jni_check_and_clear_exception(env); /* To hide JNI warning */

(*env)->CallObjectMethod(
(*env)->CallVoidMethod(
env,
jni_lifecycle_events,
mqtt5_lifecycle_events_properties.lifecycle_attempting_connect_id,
Expand All @@ -1142,10 +1142,9 @@ static void s_aws_mqtt5_client_java_lifecycle_event(const struct aws_mqtt5_clien
aws_jni_check_and_clear_exception(env); /* To hide JNI warning */

/* Set OnConnected BEFORE calling the callback so it is accurate in the callback itself. */
(*env)->CallBooleanMethod(
env, java_client->jni_client, mqtt5_client_properties.client_set_is_connected, true);
(*env)->CallVoidMethod(env, java_client->jni_client, mqtt5_client_properties.client_set_is_connected, true);

(*env)->CallObjectMethod(
(*env)->CallVoidMethod(
env,
jni_lifecycle_events,
mqtt5_lifecycle_events_properties.lifecycle_connection_success_id,
Expand All @@ -1164,7 +1163,7 @@ static void s_aws_mqtt5_client_java_lifecycle_event(const struct aws_mqtt5_clien
connack_data);
aws_jni_check_and_clear_exception(env); /* To hide JNI warning */

(*env)->CallObjectMethod(
(*env)->CallVoidMethod(
env,
jni_lifecycle_events,
mqtt5_lifecycle_events_properties.lifecycle_connection_failure_id,
Expand All @@ -1185,10 +1184,10 @@ static void s_aws_mqtt5_client_java_lifecycle_event(const struct aws_mqtt5_clien
aws_jni_check_and_clear_exception(env); /* To hide JNI warning */

/* Set OnConnected BEFORE calling the callback so it is accurate in the callback itself. */
(*env)->CallBooleanMethod(
(*env)->CallVoidMethod(
env, java_client->jni_client, mqtt5_client_properties.client_set_is_connected, false);

(*env)->CallObjectMethod(
(*env)->CallVoidMethod(
env,
jni_lifecycle_events,
mqtt5_lifecycle_events_properties.lifecycle_disconnection_id,
Expand All @@ -1205,7 +1204,7 @@ static void s_aws_mqtt5_client_java_lifecycle_event(const struct aws_mqtt5_clien
mqtt5_on_stopped_return_properties.return_constructor_id);
aws_jni_check_and_clear_exception(env); /* To hide JNI warning */

(*env)->CallObjectMethod(
(*env)->CallVoidMethod(
env,
jni_lifecycle_events,
mqtt5_lifecycle_events_properties.lifecycle_stopped_id,
Expand Down Expand Up @@ -1305,7 +1304,7 @@ static void s_aws_mqtt5_client_java_publish_received(
aws_jni_check_and_clear_exception(env); /* To hide JNI warning */

if (java_client->jni_publish_events) {
(*env)->CallObjectMethod(
(*env)->CallVoidMethod(
env,
java_client->jni_publish_events,
mqtt5_publish_events_properties.publish_events_publish_received_id,
Expand Down

0 comments on commit b285819

Please sign in to comment.