Skip to content

Commit 8d219df

Browse files
committed
Fix timeout issue
1 parent 8a4894e commit 8d219df

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/controller/java/AndroidLogDownloadFromNode.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,17 @@ void AndroidLogDownloadFromNode::OnCommandFailure(void * context, CHIP_ERROR err
197197
void AndroidLogDownloadFromNode::FinishLogDownloadFromNode(CHIP_ERROR err)
198198
{
199199
CHIP_ERROR jniErr = CHIP_NO_ERROR;
200-
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
200+
if (mBdxReceiver != nullptr)
201+
{
202+
if (mTimeout > 0)
203+
{
204+
mBdxReceiver->CancelBDXTransferTimeout();
205+
}
206+
delete mBdxReceiver;
207+
mBdxReceiver = nullptr;
208+
}
209+
210+
JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread();
201211
JniLocalReferenceScope scope(env);
202212

203213
if (err == CHIP_NO_ERROR)
@@ -214,16 +224,6 @@ void AndroidLogDownloadFromNode::FinishLogDownloadFromNode(CHIP_ERROR err)
214224
return;
215225
}
216226

217-
if (mBdxReceiver != nullptr)
218-
{
219-
if (mTimeout > 0)
220-
{
221-
mBdxReceiver->CancelBDXTransferTimeout();
222-
}
223-
delete mBdxReceiver;
224-
mBdxReceiver = nullptr;
225-
}
226-
227227
ChipLogError(Controller, "Log Download Failed : %" CHIP_ERROR_FORMAT, err.Format());
228228

229229
jmethodID onErrorMethod;

0 commit comments

Comments
 (0)