Merge pull request #46 from platelk/master

Correction error multiple read on shelf request
redstone-dart · Oct 25, 2014 · 3ecc601 · 3ecc601
2 parents 673507d + 5ec9b7c
commit 3ecc601
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/lib/mocks.dart b/lib/mocks.dart
@@ -148,8 +148,13 @@ class MockRequest extends HttpRequestParser implements UnparsedRequest {
 
   void parseBodyType() => parseHttpRequestBodyType(headers);
 
-  Future parseBody() => parseHttpRequestBody(shelfRequest.read());
-
+  Future parseBody() {
+    if (bodyHasBeenParsed() == false) {
+      return parseHttpRequestBody(_shelfRequest.read());
+    } else {
+      return parseHttpRequestBody(null);
+    }
+  }
 }
 
 /**

diff --git a/lib/server.dart b/lib/server.dart
@@ -168,6 +168,10 @@ class HttpRequestParser {
     }
   }
 
+  bool bodyHasBeenParsed() {
+    return _bodyParsed != null;
+  }
+
   Future parseHttpRequestBody(Stream<List<int>> body) {
     if (_bodyParsed == null) {
       _bodyParsed = _parseRequestBody(body, _contentType).then((HttpBody reqBody) {

diff --git a/lib/src/server_impl.dart b/lib/src/server_impl.dart
@@ -51,7 +51,14 @@ class _RequestImpl extends HttpRequestParser implements UnparsedRequest {
 
   void parseBodyType() => parseHttpRequestBodyType(headers);
 
-  Future parseBody() => parseHttpRequestBody(_shelfRequest.read());
+  Future parseBody() {
+    if (bodyHasBeenParsed() == false) {
+      return parseHttpRequestBody(_shelfRequest.read());
+    } else {
+      return parseHttpRequestBody(null);
+    }
+
+  }
 
 }