Commit 4e899699 authored by kapishnikov's avatar kapishnikov Committed by Commit bot

Cronet: fix flaky Http2Test#testHttp2

BUG=716480
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester

Review-Url: https://codereview.chromium.org/2848903003
Cr-Commit-Position: refs/heads/master@{#468049}
parent 171e2ebe
...@@ -140,7 +140,7 @@ public class CronetUrlRequestContext extends CronetEngineBase { ...@@ -140,7 +140,7 @@ public class CronetUrlRequestContext extends CronetEngineBase {
/** Holds CertVerifier data. */ /** Holds CertVerifier data. */
private String mCertVerifierData; private String mCertVerifierData;
private ConditionVariable mStopNetLogCompleted; private volatile ConditionVariable mStopNetLogCompleted;
/** /**
* True if a NetLog observer is active. * True if a NetLog observer is active.
...@@ -295,9 +295,9 @@ public class CronetUrlRequestContext extends CronetEngineBase { ...@@ -295,9 +295,9 @@ public class CronetUrlRequestContext extends CronetEngineBase {
return; return;
} }
checkHaveAdapter(); checkHaveAdapter();
mStopNetLogCompleted = new ConditionVariable();
nativeStopNetLog(mUrlRequestContextAdapter); nativeStopNetLog(mUrlRequestContextAdapter);
mIsLogging = false; mIsLogging = false;
mStopNetLogCompleted = new ConditionVariable();
} }
mStopNetLogCompleted.block(); mStopNetLogCompleted.block();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment