From 28ca76b84d2de6eaec2d2c73ab413974ce8c9ab4 Mon Sep 17 00:00:00 2001
From: Brian Muramatsu <btmura@google.com>
Date: Fri, 8 Jun 2012 16:45:02 -0700
Subject: [PATCH] Flip condition in ApacheHttpClientTest

Make sure to wait first and then check the expected state rather than
check the expected state first and then waiting.

Bug 6293413

Change-Id: Ibcb1127b935708c51fafdc8624cb3a7eefc01bda
---
 .../cts/net/src/android/net/http/cts/ApacheHttpClientTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java b/tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java
index e4846fdec2..7d9189ff33 100644
--- a/tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java
+++ b/tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java
@@ -200,7 +200,7 @@ public class ApacheHttpClientTest extends AndroidTestCase {
         }
 
         public boolean waitForStateChange() throws InterruptedException {
-            return hasExpectedState() || mReceiveLatch.await(30, TimeUnit.SECONDS);
+            return mReceiveLatch.await(30, TimeUnit.SECONDS) || hasExpectedState();
         }
 
         private boolean hasExpectedState() {