modify from comment

Author: joonhaengHeo

examples/java-matter-controller/java/src/com/matter/controller/commands/bdx/DownloadLogCommand.kt

@@ -1,5 +1,5 @@
 /*
- *   Copyright (c) 2023 Project CHIP Authors
+ *   Copyright (c) 2024 Project CHIP Authors
  *   All rights reserved.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");

src/controller/java/AndroidLogDownloadFromNode.cpp

@@ -250,6 +250,8 @@ void AndroidLogDownloadFromNode::OnTransferCallback(FabricIndex fabricIndex, Nod
     VerifyOrReturn(mJavaCallback.HasValidObjectRef(), ChipLogError(Controller, "mJavaCallback is invalid"));
 
     JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
+    VerifyOrReturn(env != nullptr, ChipLogError(Controller, "Could not get JNIEnv for current thread"));
+
     JniLocalReferenceScope scope(env);
 
     jmethodID onTransferDataMethod;

src/controller/java/AndroidLogDownloadFromNode.h

@@ -54,7 +54,7 @@ class AndroidLogDownloadFromNode
     AndroidLogDownloadFromNode(DeviceController * controller, NodeId remoteNodeId, app::Clusters::DiagnosticLogs::IntentEnum intent,
                                uint16_t timeout, jobject javaCallback);
 
-    DeviceController * mController;
+    DeviceController * mController = nullptr;
 
     chip::Callback::Callback<OnDeviceConnected> mOnDeviceConnectedCallback;
     chip::Callback::Callback<OnDeviceConnectionFailure> mOnDeviceConnectionFailureCallback;
@@ -63,9 +63,9 @@ class AndroidLogDownloadFromNode
     chip::Callback::Callback<OnBdxTransferFailure> mOnBdxTransferFailureCallback;
 
     chip::JniGlobalReference mJavaCallback;
-    NodeId mRemoteNodeId;
-    app::Clusters::DiagnosticLogs::IntentEnum mIntent;
-    uint16_t mTimeout;
+    NodeId mRemoteNodeId                              = chip::kUndefinedNodeId;
+    app::Clusters::DiagnosticLogs::IntentEnum mIntent = app::Clusters::DiagnosticLogs::IntentEnum::kUnknownEnumValue;
+    uint16_t mTimeout                                 = 0;
 
     char mFileDesignatorBuffer[bdx::DiagnosticLogs::kMaxFileDesignatorLen];
     MutableCharSpan mFileDesignator = MutableCharSpan(mFileDesignatorBuffer, bdx::DiagnosticLogs::kMaxFileDesignatorLen);

src/controller/java/BdxDiagnosticLogsReceiver.cpp

@@ -42,6 +42,8 @@ BdxDiagnosticLogsReceiver::BdxDiagnosticLogsReceiver(Callback::Callback<OnBdxTra
 
 CHIP_ERROR BdxDiagnosticLogsReceiver::OnTransferBegin(chip::bdx::BDXTransferProxy * transfer)
 {
+    VerifyOrReturnError(transfer != nullptr, CHIP_ERROR_INVALID_ARGUMENT, ChipLogError(Controller, "transfer is nullptr."));
+
     chip::CharSpan fileDesignator = transfer->GetFileDesignator();
     chip::FabricIndex fabricIndex = transfer->GetFabricIndex();
     chip::NodeId nodeId           = transfer->GetPeerNodeId();

src/controller/java/src/chip/devicecontroller/DownloadLogCallback.java

@@ -1,5 +1,5 @@
 /*
- *   Copyright (c) 2022 Project CHIP Authors
+ *   Copyright (c) 2024 Project CHIP Authors
  *   All rights reserved.
  *
  *   Licensed under the Apache License, Version 2.0 (the "License");