summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2013-08-21 08:24:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-08-21 08:24:50 +0000
commite00a6fc6b8662a252da3405d737e1b6e8e699756 (patch)
treef0aac96c3227590923594cc4e9d43dcd10d4bfcf
parent26f6cb45a876d447c47dc7a413c76b2467341484 (diff)
parenta4a53d9c9bf86165a5e2bd9ce4bcb834f09d4c37 (diff)
downloadmockwebserver-e00a6fc6b8662a252da3405d737e1b6e8e699756.tar.gz
Merge "Add bookkeeping requests to the request queue."
-rw-r--r--src/main/java/com/google/mockwebserver/MockResponse.java2
-rw-r--r--src/main/java/com/google/mockwebserver/MockWebServer.java5
-rw-r--r--src/main/java/com/google/mockwebserver/RecordedRequest.java4
3 files changed, 7 insertions, 4 deletions
diff --git a/src/main/java/com/google/mockwebserver/MockResponse.java b/src/main/java/com/google/mockwebserver/MockResponse.java
index 674a911..7bca741 100644
--- a/src/main/java/com/google/mockwebserver/MockResponse.java
+++ b/src/main/java/com/google/mockwebserver/MockResponse.java
@@ -235,6 +235,6 @@ public final class MockResponse implements Cloneable {
}
@Override public String toString() {
- return status;
+ return "MockResponse{" + status + "}";
}
}
diff --git a/src/main/java/com/google/mockwebserver/MockWebServer.java b/src/main/java/com/google/mockwebserver/MockWebServer.java
index 31bc2fc..5e3a1d7 100644
--- a/src/main/java/com/google/mockwebserver/MockWebServer.java
+++ b/src/main/java/com/google/mockwebserver/MockWebServer.java
@@ -374,7 +374,10 @@ public final class MockWebServer {
private void dispatchBookkeepingRequest(int sequenceNumber, Socket socket) throws InterruptedException {
requestCount.incrementAndGet();
- dispatcher.dispatch(new RecordedRequest(null, null, null, -1, null, sequenceNumber, socket));
+ RecordedRequest request = new RecordedRequest(null, null, null, -1, null, sequenceNumber,
+ socket);
+ dispatcher.dispatch(request);
+ requestQueue.add(request);
}
/**
diff --git a/src/main/java/com/google/mockwebserver/RecordedRequest.java b/src/main/java/com/google/mockwebserver/RecordedRequest.java
index 2864d80..1f8fd75 100644
--- a/src/main/java/com/google/mockwebserver/RecordedRequest.java
+++ b/src/main/java/com/google/mockwebserver/RecordedRequest.java
@@ -162,6 +162,6 @@ public final class RecordedRequest {
}
@Override public String toString() {
- return requestLine;
+ return "RecordedRequest {" + requestLine + "}";
}
-} \ No newline at end of file
+}