From 11ec0acded68fa5b34e3f8d2a2b6a09ac5e96d1b Mon Sep 17 00:00:00 2001
From: Jesse Van Hill <jlvanhil@us.ibm.com>
Date: Mon, 19 Apr 2021 11:05:10 -0500
Subject: [PATCH] Fix #2 for test failure in RTC 282932. Unconditionally reset
 the server in KdcHelper in test setup.

---
 .../ibm/ws/security/spnego/fat/config/CommonTest.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dev/com.ibm.ws.security.spnego.fat.common/fat/src/com/ibm/ws/security/spnego/fat/config/CommonTest.java b/dev/com.ibm.ws.security.spnego.fat.common/fat/src/com/ibm/ws/security/spnego/fat/config/CommonTest.java
index 40805d6a54e..6f2be0f3ee4 100644
--- a/dev/com.ibm.ws.security.spnego.fat.common/fat/src/com/ibm/ws/security/spnego/fat/config/CommonTest.java
+++ b/dev/com.ibm.ws.security.spnego.fat.common/fat/src/com/ibm/ws/security/spnego/fat/config/CommonTest.java
@@ -313,14 +313,15 @@ public static void commonSetUp(String testServerName, String serverXml, List<Str
             Log.info(c, thisMethod, "Using initial config: " + config);
         }
 
+        if (getKdcHelper() == null) {
+            setKdcHelper(getKdcHelper(getMyServer()));
+        } else {
+            createKrbConf(getKdcHelper().server);
+        }
+
         if (createSpnAndKeytab) {
             try {
                 Log.info(c, thisMethod, "Creating SPN and keytab");
-                if (getKdcHelper() == null) {
-                    setKdcHelper(getKdcHelper(getMyServer()));
-                } else {
-                    createKrbConf(getKdcHelper().server);
-                }
                 getKdcHelper().createSpnAndKeytab(spnRealm, useCanonicalHostName, SPNEGOConstants.DEFAULT_CMD_ARGS);
             } catch (Exception e) {
                 Log.info(c, thisMethod, "Got unexpected exception; no tests will be run: " + CommonTest.maskHostnameAndPassword(e.getMessage()));