summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Thierer <tobiast@google.com>2019-04-09 04:09:20 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-04-09 04:09:20 -0700
commit954e762c5c1beb530d55a54e1c3caa7169057b06 (patch)
tree72415d0a139de1c4912607f02875205c03ea1879
parent399b47aa532f6904cc649122e29121cdbe7e1998 (diff)
parentfde7df8250ab9ddf69ea5eebef1cf38f5f3cbf19 (diff)
downloadmockwebserver-954e762c5c1beb530d55a54e1c3caa7169057b06.tar.gz
Merge "Let MockWebServer respect MockResponse.getBodyDelayTimeMs()."android-o-mr1-iot-release-1.0.13
am: fde7df8250 Change-Id: Ia371d32c9c7a4187c2d092cbb3c00896769ab790
-rw-r--r--src/main/java/com/google/mockwebserver/MockWebServer.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/com/google/mockwebserver/MockWebServer.java b/src/main/java/com/google/mockwebserver/MockWebServer.java
index 13a4597..e9b52d9 100644
--- a/src/main/java/com/google/mockwebserver/MockWebServer.java
+++ b/src/main/java/com/google/mockwebserver/MockWebServer.java
@@ -517,6 +517,14 @@ public final class MockWebServer {
InputStream in = response.getBodyStream();
if (in == null) return;
+ long bodyDelayTimeMs = response.getBodyDelayTimeMs();
+ if (bodyDelayTimeMs > 0) {
+ try {
+ Thread.sleep(bodyDelayTimeMs);
+ } catch (InterruptedException e) {
+ throw new AssertionError();
+ }
+ }
throttledTransfer(response, in, out, Long.MAX_VALUE);
}