File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -50,13 +50,12 @@ struct aws_mqtt_iot_metrics_java_jni *aws_mqtt_iot_metrics_java_jni_create_from_
5050 s_iot_device_sdk_metrics_string ,
5151 "library name" ,
5252 & java_metrics -> library_name_buf ,
53- & java_metrics -> library_name_cursor ,
53+ & java_metrics -> metrics . library_name ,
5454 false,
5555 NULL ) == AWS_OP_ERR ) {
5656 AWS_LOGF_ERROR (AWS_LS_MQTT_GENERAL , "IoTDeviceSDKMetrics create_from_java: No library name found" );
5757 goto on_error ;
5858 }
59- java_metrics -> metrics .library_name = java_metrics -> library_name_cursor ;
6059
6160 return java_metrics ;
6261
@@ -65,12 +64,3 @@ struct aws_mqtt_iot_metrics_java_jni *aws_mqtt_iot_metrics_java_jni_create_from_
6564 aws_mqtt_iot_metrics_java_jni_destroy (env , allocator , java_metrics );
6665 return NULL ;
6766}
68-
69- struct aws_mqtt_iot_metrics * aws_mqtt_iot_metrics_java_jni_get_metrics (
70- struct aws_mqtt_iot_metrics_java_jni * java_metrics ) {
71- if (java_metrics ) {
72- return & java_metrics -> metrics ;
73- } else {
74- return NULL ;
75- }
76- }
Original file line number Diff line number Diff line change 1212struct aws_mqtt_iot_metrics_java_jni {
1313 struct aws_mqtt_iot_metrics metrics ;
1414 struct aws_byte_buf library_name_buf ;
15- struct aws_byte_cursor library_name_cursor ;
1615};
1716
1817void aws_mqtt_iot_metrics_java_jni_destroy (
@@ -25,7 +24,4 @@ struct aws_mqtt_iot_metrics_java_jni *aws_mqtt_iot_metrics_java_jni_create_from_
2524 struct aws_allocator * allocator ,
2625 jobject java_iot_device_sdk_metrics );
2726
28- struct aws_mqtt_iot_metrics * aws_mqtt_iot_metrics_java_jni_get_metrics (
29- struct aws_mqtt_iot_metrics_java_jni * java_metrics );
30-
3127#endif /* AWS_JNI_IOT_DEVICE_SDK_METRICS_H */
Original file line number Diff line number Diff line change @@ -1129,6 +1129,11 @@ JNIEXPORT void JNICALL Java_software_amazon_awssdk_crt_mqtt_MqttClientConnection
11291129 struct aws_mqtt_iot_metrics_java_jni * iot_metrics_java_jni =
11301130 aws_mqtt_iot_metrics_java_jni_create_from_java (env , aws_jni_get_allocator (), jni_metrics );
11311131
1132+ if (iot_metrics_java_jni == NULL ) {
1133+ AWS_LOGF_DEBUG (AWS_LS_MQTT_CLIENT , "MqttClientConnection failed to create metrics." );
1134+ return ;
1135+ }
1136+
11321137 if (aws_mqtt_client_connection_set_metrics (connection -> client_connection , & iot_metrics_java_jni -> metrics )) {
11331138 int error = aws_last_error ();
11341139 AWS_LOGF_DEBUG (
You can’t perform that action at this time.
0 commit comments