Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 834e5ce1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Allow getResponseCode to block if response hasn't been received from remote"

parents 53ff75bb f8c2ad08

obex/javax/obex/ClientOperation.java

+3 −3
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ public final class ClientOperation implements Operation, BaseStream { 
     *         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 @@ public final class ClientOperation implements Operation, BaseStream { 
    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();

        }

    }