commit 83aa2d278c5a3f9b93cd809f6fdffba9d1fa3868
author Brian Muramatsu <btmura@google.com> Wed May 09 12:11:31 2012 -0700
committer Brian Muramatsu <btmura@google.com> Wed May 09 15:18:05 2012 -0700
tree 143847a28055f4eed09975cc3fa0314879bfa849
parent 3b406d4de9b5f0f1caa990f079075eb0bfc5220a

Fix NPE in RecordedRequest Constructor

Bug 6294000

MockWebServer passes null as the requestLine argument to
RecordedRequest sometimes which causes a NPE. Fix
RecordedRequest's constructor to allow for null method
and path which is parsed from the requestLine argument.

Change-Id: Ibbff001629cbc95b389bea3bebe5583a50a7223e

src/main/java/com/google/mockwebserver/RecordedRequest.java

diff --git a/src/main/java/com/google/mockwebserver/RecordedRequest.java b/src/main/java/com/google/mockwebserver/RecordedRequest.java
index 8d7dc87..0728ff3 100644
--- a/src/main/java/com/google/mockwebserver/RecordedRequest.java
+++ b/src/main/java/com/google/mockwebserver/RecordedRequest.java
@@ -50,10 +50,15 @@
             sslProtocol = null;
         }
 
-        int methodEnd = requestLine.indexOf(' ');
-        int pathEnd = requestLine.indexOf(' ', methodEnd + 1);
-        this.method = requestLine.substring(0, methodEnd);
-        this.path = requestLine.substring(methodEnd + 1, pathEnd);
+        if (requestLine != null) {
+            int methodEnd = requestLine.indexOf(' ');
+            int pathEnd = requestLine.indexOf(' ', methodEnd + 1);
+            this.method = requestLine.substring(0, methodEnd);
+            this.path = requestLine.substring(methodEnd + 1, pathEnd);
+        } else {
+            this.method = null;
+            this.path = null;
+        }
     }
 
     public String getRequestLine() {