Address review comments.

Author: kannanjgithub

gae-interop-testing/gae-jdk8/build.gradle

@@ -132,27 +132,54 @@ tasks.register("runInteropTestRemote") {
         def result2 = null
         String result1Body = ""
         String result2Body = ""
+        boolean success = false
+        int lastResult1Code = -1
+        int lastResult2Code = -1
         for (int attempt = 0; attempt < maxChannelReuseRetries; attempt++) {
             try {
                 result1 = client.newCall(request).execute()
                 result2 = client.newCall(request).execute()
-                if (result1.code() == 200 && result2.code() == 200) {
+                if (result1 != null) {
+                    lastResult1Code = result1.code()
+                }
+                if (result2 != null) {
+                    lastResult2Code = result2.code()
+                }
+                if (lastResult1Code == 200 && lastResult2Code == 200) {
+                    success = true
                     break
                 }
-                logger.log(LogLevel.WARN, "Channel reuse attempt ${attempt + 1} failed: result1 code = ${result1?.code()}, result2 code = ${result2?.code()}. Retrying...")
-            } catch (Throwable t) {
-                logger.log(LogLevel.WARN, "Channel reuse attempt ${attempt + 1} caught exception: ${t.message}. Retrying...", t)
+                if (result1 != null) {
+                    try {
+                        result1Body = result1.body().string()
+                    } catch (Exception e) {
+                        result1Body = "Error reading body: " + e.getMessage()
+                    }
+                }
+                if (result2 != null) {
+                    try {
+                        result2Body = result2.body().string()
+                    } catch (Exception e) {
+                        result2Body = "Error reading body: " + e.getMessage()
+                    }
+                }
+                logger.log(LogLevel.WARN, "Channel reuse attempt ${attempt + 1} failed: result1 code = ${lastResult1Code} (body: ${result1Body}), result2 code = ${lastResult2Code} (body: ${result2Body}). Retrying...")
+            } catch (Exception e) {
+                logger.log(LogLevel.WARN, "Channel reuse attempt ${attempt + 1} caught exception: ${e.message}. Retrying...", e)
+            } finally {
+                if (result1 != null) {
+                    try { result1.body().close() } catch (Exception ignored) {}
+                    result1 = null
+                }
+                if (result2 != null) {
+                    try { result2.body().close() } catch (Exception ignored) {}
+                    result2 = null
+                }
             }
             Thread.sleep(2000)
         }
-        if (result1 == null || result2 == null || result1.code() != 200 || result2.code() != 200) {
-            if (result1 != null) {
-                result1Body = result1.body().string()
-            }
-            if (result2 != null) {
-                result2Body = result2.body().string()
-            }
-            throw new GradleException("Unable to reuse same channel across requests. result1: ${result1?.code()} (body: ${result1Body}), result2: ${result2?.code()} (body: ${result2Body})")
+        if (!success) {
+            throw new GradleException("Unable to reuse same channel across requests. result1: ${lastResult1Code} (body: ${result1Body}), result2: ${lastResult2Code} (body: ${result2Body})")
         }
 
         // The test suite can take a while to run