From 2fac55ced5c5e37112d3d2ab6ed0f7f88a725838 Mon Sep 17 00:00:00 2001
From: Weijun Wang <weijun@openjdk.org>
Date: Wed, 17 Jul 2013 18:46:00 +0800
Subject: [PATCH] 8020696: Merge problem for KdcComm.java

Reviewed-by: chegar
---
 jdk/src/share/classes/sun/security/krb5/KdcComm.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/jdk/src/share/classes/sun/security/krb5/KdcComm.java b/jdk/src/share/classes/sun/security/krb5/KdcComm.java
index ae3b0f098b7..3d50f9569d3 100644
--- a/jdk/src/share/classes/sun/security/krb5/KdcComm.java
+++ b/jdk/src/share/classes/sun/security/krb5/KdcComm.java
@@ -227,15 +227,15 @@ public final class KdcComm {
         try {
             ibuf = sendIfPossible(obuf, tempKdc.next(), useTCP);
         } catch(Exception first) {
+            boolean ok = false;
             while(tempKdc.hasNext()) {
                 try {
                     ibuf = sendIfPossible(obuf, tempKdc.next(), useTCP);
-                    if (ibuf != null) {
-                        return ibuf;
-                    }
+                    ok = true;
+                    break;
                 } catch(Exception ignore) {}
             }
-            throw first;
+            if (!ok) throw first;
         }
         if (ibuf == null) {
             throw new IOException("Cannot get a KDC reply");