commit b98783291802ef762a543876cb4f7f428d0d97fa
author Ajay Panicker <apanicke@google.com> Mon Aug 22 20:47:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 22 20:47:48 2016 +0000
tree 3a93c92ae5089e9c93d51d393baa2703b3f66ef3
parent 779a1f096cfe81db421ffd88e2e1fda056462157
parent 834e5ce170a3bb7ef1a87743ec7dda5602d85797

Merge "Allow getResponseCode to block if response hasn't been received from remote"
am: 834e5ce170

Change-Id: I3fc5b8c49623f6054995029105c4f6712ec63674

obex/javax/obex/ClientOperation.java

diff --git a/obex/javax/obex/ClientOperation.java b/obex/javax/obex/ClientOperation.java
index eb7e280..c627dfb 100644
--- a/obex/javax/obex/ClientOperation.java
+++ b/obex/javax/obex/ClientOperation.java
@@ -207,7 +207,6 @@
      *         object
      */
     public synchronized int getResponseCode() throws IOException {
-        //avoid dup validateConnection
         if ((mReplyHeader.responseCode == -1)
                 || (mReplyHeader.responseCode == ResponseCodes.OBEX_HTTP_CONTINUE)) {
             validateConnection();
@@ -423,8 +422,9 @@
     private void validateConnection() throws IOException {
         ensureOpen();
 
-        // to sure only one privateInput object exist.
-        if (mPrivateInput == null) {
+        // Make sure that a response has been recieved from remote
+        // before continuing
+        if (mPrivateInput == null || mReplyHeader.responseCode == -1) {
             startProcessing();
         }
     }