From dd5910420c8ba558e58acc65bd747b94b2add156 Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Mon, 22 Nov 2021 12:27:53 +0100
Subject: [PATCH 1/3] Round 2 of basic cleaning for JTA code

Signed-off-by: arjantijms <arjan.tijms@gmail.com>
---
 appserver/transaction/jts/pom.xml             |   2 +-
 .../JavaEETransactionManagerJTSDelegate.java  | 549 +++++++++---------
 .../jts/ResourceRecoveryManagerImpl.java      | 167 +++---
 .../DelegatedTransactionRecoveryFence.java    |  25 +-
 .../jts/api/TransactionRecoveryFence.java     |  15 +-
 .../iiop/TransactionClientInterceptor.java    |  38 +-
 .../TransactionIIOPInterceptorFactory.java    |  85 ++-
 .../iiop/TransactionInterceptorFactory.java   |  18 +-
 .../iiop/TransactionServerInterceptor.java    |  32 +-
 .../jts/iiop/TxIORInterceptor.java            |  51 +-
 .../transaction/jts/recovery/GMSCallBack.java |  86 +--
 .../jts/recovery/OracleXAResource.java        | 203 ++++---
 .../jts/recovery/RecoveryLockFile.java        | 132 +++--
 .../jts/recovery/SybaseXAResource.java        |  70 +--
 14 files changed, 736 insertions(+), 737 deletions(-)

diff --git a/appserver/transaction/jts/pom.xml b/appserver/transaction/jts/pom.xml
index 471bdad94c6..f68b38d2882 100644
--- a/appserver/transaction/jts/pom.xml
+++ b/appserver/transaction/jts/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
+    Copyright (c) 2021 Contributors to the Eclipse Foundation
     Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
@@ -24,7 +25,6 @@
         <groupId>org.glassfish.main.transaction</groupId>
         <artifactId>transaction</artifactId>
         <version>6.2.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>jts</artifactId>
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
index b03b3631e52..9d192660e1c 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/JavaEETransactionManagerJTSDelegate.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,140 +17,139 @@
 
 package com.sun.enterprise.transaction.jts;
 
-import java.util.Arrays;
-import java.util.Collections;
+import static com.sun.enterprise.config.serverbeans.ServerTags.KEYPOINT_INTERVAL;
+import static com.sun.enterprise.config.serverbeans.ServerTags.RETRY_TIMEOUT_IN_SECONDS;
+import static jakarta.transaction.Status.STATUS_NO_TRANSACTION;
+import static java.util.Arrays.asList;
+import static java.util.Collections.enumeration;
+import static java.util.logging.Level.FINE;
+
 import java.util.Hashtable;
 import java.util.Properties;
-import java.util.logging.Logger;
-import java.util.logging.Level;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.Condition;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-import jakarta.transaction.*;
-import javax.transaction.xa.*;
-import jakarta.resource.spi.XATerminator;
-import jakarta.resource.spi.work.WorkException;
-
-import com.sun.enterprise.transaction.config.TransactionService;
-import com.sun.jts.jta.TransactionManagerImpl;
-import com.sun.jts.jta.TransactionServiceProperties;
-import com.sun.jts.CosTransactions.Configuration;
-import com.sun.jts.CosTransactions.DefaultTransactionService;
-import com.sun.jts.CosTransactions.RecoveryManager;
-import com.sun.jts.CosTransactions.DelegatedRecoveryManager;
-import com.sun.jts.CosTransactions.RWLock;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
 
-import com.sun.enterprise.config.serverbeans.ServerTags;
+import org.glassfish.api.admin.ServerEnvironment;
+import org.glassfish.hk2.api.PostConstruct;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.jvnet.hk2.annotations.Service;
 
+import com.sun.enterprise.transaction.JavaEETransactionImpl;
+import com.sun.enterprise.transaction.JavaEETransactionManagerSimplified;
 import com.sun.enterprise.transaction.api.JavaEETransaction;
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
 import com.sun.enterprise.transaction.api.TransactionAdminBean;
 import com.sun.enterprise.transaction.api.XAResourceWrapper;
-import com.sun.enterprise.transaction.spi.JavaEETransactionManagerDelegate;
-import com.sun.enterprise.transaction.spi.TransactionalResource;
-import com.sun.enterprise.transaction.spi.TransactionInternal;
-
+import com.sun.enterprise.transaction.config.TransactionService;
+import com.sun.enterprise.transaction.jts.recovery.GMSCallBack;
 import com.sun.enterprise.transaction.jts.recovery.OracleXAResource;
 import com.sun.enterprise.transaction.jts.recovery.SybaseXAResource;
-import com.sun.enterprise.transaction.jts.recovery.GMSCallBack;
-
-import com.sun.enterprise.transaction.JavaEETransactionManagerSimplified;
-import com.sun.enterprise.transaction.JavaEETransactionImpl;
-
+import com.sun.enterprise.transaction.spi.JavaEETransactionManagerDelegate;
+import com.sun.enterprise.transaction.spi.TransactionInternal;
+import com.sun.enterprise.transaction.spi.TransactionalResource;
 import com.sun.enterprise.util.i18n.StringManager;
+import com.sun.jts.CosTransactions.Configuration;
+import com.sun.jts.CosTransactions.DefaultTransactionService;
+import com.sun.jts.CosTransactions.DelegatedRecoveryManager;
+import com.sun.jts.CosTransactions.RWLock;
+import com.sun.jts.CosTransactions.RecoveryManager;
+import com.sun.jts.jta.TransactionManagerImpl;
+import com.sun.jts.jta.TransactionServiceProperties;
 import com.sun.logging.LogDomains;
-import org.glassfish.api.admin.ServerEnvironment;
-
-import org.jvnet.hk2.annotations.Service;
 
 import jakarta.inject.Inject;
-import org.glassfish.hk2.api.PostConstruct;
-import org.glassfish.hk2.api.ServiceLocator;
+import jakarta.resource.spi.XATerminator;
+import jakarta.resource.spi.work.WorkException;
+import jakarta.transaction.HeuristicMixedException;
+import jakarta.transaction.HeuristicRollbackException;
+import jakarta.transaction.InvalidTransactionException;
+import jakarta.transaction.NotSupportedException;
+import jakarta.transaction.RollbackException;
+import jakarta.transaction.SystemException;
+import jakarta.transaction.Transaction;
+import jakarta.transaction.TransactionManager;
 
 /**
- ** Implementation of JavaEETransactionManagerDelegate that supports XA
- * transactions with JTS.
+ ** Implementation of JavaEETransactionManagerDelegate that supports XA transactions with JTS.
  *
  * @author Marina Vatkina
  */
 @Service
-public class JavaEETransactionManagerJTSDelegate
-            implements JavaEETransactionManagerDelegate, PostConstruct {
+public class JavaEETransactionManagerJTSDelegate implements JavaEETransactionManagerDelegate, PostConstruct {
+
+    // Use JavaEETransactionManagerSimplified logger and Sting Manager for Localization
+    private static StringManager sm = StringManager.getManager(JavaEETransactionManagerSimplified.class);
+    private final static ReadWriteLock lock = new ReadWriteLock();
+    private static JavaEETransactionManagerJTSDelegate instance;
 
-    @Inject private ServiceLocator serviceLocator;
+    @Inject
+    private ServiceLocator serviceLocator;
 
-    // an implementation of the JavaEETransactionManager that calls
-    // this object.
-    // @Inject
-    private JavaEETransactionManager javaEETM;
+    // An implementation of the JavaEETransactionManager that calls this object.
+    private JavaEETransactionManager javaEETransactionManager;
 
-    // an implementation of the JTA TransactionManager provided by JTS.
-    private ThreadLocal<TransactionManager> tmLocal = new ThreadLocal();
+    // An implementation of the JTA TransactionManager provided by JTS.
+    private ThreadLocal<TransactionManager> transactionManagerLocal = new ThreadLocal<>();
 
     private Hashtable globalTransactions;
-    private Hashtable<String, XAResourceWrapper> xaresourcewrappers =
-            new Hashtable<String, XAResourceWrapper>();
+    private Hashtable<String, XAResourceWrapper> xaresourcewrappers = new Hashtable<String, XAResourceWrapper>();
 
     private Logger _logger;
 
-    // Use JavaEETransactionManagerSimplified logger and Sting Manager for Localization
-    private static StringManager sm
-           = StringManager.getManager(JavaEETransactionManagerSimplified.class);
-
     private boolean lao = true;
-    private final static ReadWriteLock lock = new ReadWriteLock();
-    private static JavaEETransactionManagerJTSDelegate instance = null;
-    private volatile TransactionManager transactionManagerImpl = null;
-    private TransactionService txnService = null;
+
+    private volatile TransactionManager transactionManagerImpl;
+    private TransactionService transactionService;
 
     public JavaEETransactionManagerJTSDelegate() {
         globalTransactions = new Hashtable();
     }
 
     public void postConstruct() {
-        if (javaEETM != null) {
+        if (javaEETransactionManager != null) {
             // JavaEETransactionManager has been already initialized
-            javaEETM.setDelegate(this);
+            javaEETransactionManager.setDelegate(this);
         }
 
         _logger = LogDomains.getLogger(JavaEETransactionManagerSimplified.class, LogDomains.JTA_LOGGER);
         initTransactionProperties();
 
         setInstance(this);
-        //transactionManagerImpl = TransactionManagerImpl.getTransactionManagerImpl();
     }
 
     public boolean useLAO() {
-         return lao;
+        return lao;
     }
 
     public void setUseLAO(boolean b) {
         lao = b;
     }
 
-    /** An XA transaction commit
+    /**
+     * An XA transaction commit
      */
-    public void commitDistributedTransaction() throws
-            RollbackException, HeuristicMixedException,
-            HeuristicRollbackException, SecurityException,
-            IllegalStateException, SystemException {
+    public void commitDistributedTransaction() throws RollbackException, HeuristicMixedException, HeuristicRollbackException,
+            SecurityException, IllegalStateException, SystemException {
+        _logger.log(FINE, "TM: commit");
 
-        if (_logger.isLoggable(Level.FINE))
-                _logger.log(Level.FINE,"TM: commit");
         validateTransactionManager();
-        TransactionManager tm = tmLocal.get();
-        Object obj = tm.getTransaction(); // monitoring object
+        TransactionManager transactionManager = transactionManagerLocal.get();
+        Object obj = transactionManager.getTransaction(); // monitoring object
 
-        JavaEETransactionManagerSimplified javaEETMS =
-                (JavaEETransactionManagerSimplified)javaEETM;
+        JavaEETransactionManagerSimplified javaEETMS = (JavaEETransactionManagerSimplified) javaEETransactionManager;
 
         boolean success = false;
         if (javaEETMS.isInvocationStackEmpty()) {
-            try{
-                tm.commit();
+            try {
+                transactionManager.commit();
                 success = true;
-            }catch(HeuristicMixedException e){
+            } catch (HeuristicMixedException e) {
                 success = true;
                 throw e;
             } finally {
@@ -158,13 +158,9 @@ public void commitDistributedTransaction() throws
         } else {
             try {
                 javaEETMS.setTransactionCompeting(true);
-                tm.commit();
+                transactionManager.commit();
                 success = true;
-/**
-            } catch (InvocationException ex) {
-                assert false;
-**/
-            }catch(HeuristicMixedException e){
+            } catch (HeuristicMixedException e) {
                 success = true;
                 throw e;
             } finally {
@@ -174,32 +170,25 @@ public void commitDistributedTransaction() throws
         }
     }
 
-    /** An XA transaction rollback
-    */
-    public void rollbackDistributedTransaction() throws IllegalStateException,
-            SecurityException, SystemException {
-
-        if (_logger.isLoggable(Level.FINE))
-                _logger.log(Level.FINE,"TM: rollback");
+    /**
+     * An XA transaction rollback
+     */
+    public void rollbackDistributedTransaction() throws IllegalStateException, SecurityException, SystemException {
+        _logger.log(FINE, "TM: rollback");
         validateTransactionManager();
 
-        TransactionManager tm = tmLocal.get();
-        Object obj = tm.getTransaction(); // monitoring object
+        TransactionManager transactionManager = transactionManagerLocal.get();
+        Object obj = transactionManager.getTransaction(); // monitoring object
 
-        JavaEETransactionManagerSimplified javaEETMS =
-                (JavaEETransactionManagerSimplified)javaEETM;
+        JavaEETransactionManagerSimplified javaEETMS = (JavaEETransactionManagerSimplified) javaEETransactionManager;
 
         try {
             if (javaEETMS.isInvocationStackEmpty()) {
-                tm.rollback();
+                transactionManager.rollback();
             } else {
                 try {
                     javaEETMS.setTransactionCompeting(true);
-                    tm.rollback();
-/**
-                } catch (InvocationException ex) {
-                    assert false;
-**/
+                    transactionManager.rollback();
                 } finally {
                     javaEETMS.setTransactionCompeting(false);
                 }
@@ -210,178 +199,176 @@ public void rollbackDistributedTransaction() throws IllegalStateException,
     }
 
     public int getStatus() throws SystemException {
+        JavaEETransaction tx = javaEETransactionManager.getCurrentTransaction();
+        int status = STATUS_NO_TRANSACTION;
 
-        JavaEETransaction tx = javaEETM.getCurrentTransaction();
-        int status = jakarta.transaction.Status.STATUS_NO_TRANSACTION;
-
-        TransactionManager tm = tmLocal.get();
-        if ( tx != null)
+        TransactionManager transactionManager = transactionManagerLocal.get();
+        if (tx != null) {
             status = tx.getStatus();
-        else if (tm != null)
-            status = tm.getStatus();
+        } else if (transactionManager != null) {
+            status = transactionManager.getStatus();
+        }
 
-        if (_logger.isLoggable(Level.FINE))
-            _logger.log(Level.FINE,"TM: status: " + JavaEETransactionManagerSimplified.getStatusAsString(status));
+        if (_logger.isLoggable(FINE)) {
+            _logger.log(FINE, "TM: status: " + JavaEETransactionManagerSimplified.getStatusAsString(status));
+        }
 
         return status;
     }
 
-    public Transaction getTransaction()
-            throws SystemException {
-        JavaEETransaction tx = javaEETM.getCurrentTransaction();
-        if (_logger.isLoggable(Level.FINE))
-            _logger.log(Level.FINE,"TM: getTransaction: tx=" + tx + ", tm=" + tmLocal.get());
+    public Transaction getTransaction() throws SystemException {
+        JavaEETransaction javaEETransaction = javaEETransactionManager.getCurrentTransaction();
+        if (_logger.isLoggable(FINE)) {
+            _logger.log(FINE, "TM: getTransaction: tx=" + javaEETransaction + ", tm=" + transactionManagerLocal.get());
+        }
 
-        if ( tx != null )
-            return tx;
+        if (javaEETransaction != null) {
+            return javaEETransaction;
+        }
 
         // Check for a JTS imported tx
         TransactionInternal jtsTx = null;
-        TransactionManager tm = tmLocal.get();
+        TransactionManager tm = transactionManagerLocal.get();
         if (tm != null) {
-            jtsTx = (TransactionInternal)tm.getTransaction();
+            jtsTx = (TransactionInternal) tm.getTransaction();
         }
 
-        if ( jtsTx == null )
+        if (jtsTx == null) {
             return null;
-        else {
-            // check if this JTS Transaction was previously active
-            // in this JVM (possible for distributed loopbacks).
-            tx = (JavaEETransaction)globalTransactions.get(jtsTx);
-            if (_logger.isLoggable(Level.FINE))
-                _logger.log(Level.FINE,"TM: getTransaction: tx=" + tx + ", jtsTx=" + jtsTx);
-
-            if ( tx == null ) {
-                tx = ((JavaEETransactionManagerSimplified)javaEETM).createImportedTransaction(jtsTx);
-                globalTransactions.put(jtsTx, tx);
-            }
-            javaEETM.setCurrentTransaction(tx); // associate tx with thread
-            return tx;
         }
-    }
 
-    public JavaEETransaction getJavaEETransaction(Transaction t) {
-        if(t instanceof JavaEETransaction){
-            return  (JavaEETransaction)t;
+        // Check if this JTS Transaction was previously active in this JVM (possible for distributed loopbacks).
+        javaEETransaction = (JavaEETransaction) globalTransactions.get(jtsTx);
+        if (_logger.isLoggable(FINE)) {
+            _logger.log(FINE, "TM: getTransaction: tx=" + javaEETransaction + ", jtsTx=" + jtsTx);
         }
 
-        return (JavaEETransaction)globalTransactions.get(t);
+        if (javaEETransaction == null) {
+            javaEETransaction = ((JavaEETransactionManagerSimplified) javaEETransactionManager).createImportedTransaction(jtsTx);
+            globalTransactions.put(jtsTx, javaEETransaction);
+        }
 
+        javaEETransactionManager.setCurrentTransaction(javaEETransaction); // associate tx with thread
+        return javaEETransaction;
     }
-    public boolean enlistDistributedNonXAResource(Transaction tx, TransactionalResource h)
-           throws RollbackException, IllegalStateException, SystemException {
-        if(useLAO()) {
-            if (((JavaEETransactionManagerSimplified)javaEETM).resourceEnlistable(h)) {
-                XAResource res = h.getXAResource();
-                boolean result = tx.enlistResource(res);
-                if (!h.isEnlisted())
-                    h.enlistedInTransaction(tx);
-                    return result;
-                } else {
-                    return true;
-            }
-        } else {
-            throw new IllegalStateException(
-                    sm.getString("enterprise_distributedtx.nonxa_usein_jts"));
+
+    public JavaEETransaction getJavaEETransaction(Transaction transaction) {
+        if (transaction instanceof JavaEETransaction) {
+            return (JavaEETransaction) transaction;
         }
+
+        return (JavaEETransaction) globalTransactions.get(transaction);
     }
 
-    public boolean enlistLAOResource(Transaction tran, TransactionalResource h)
-           throws RollbackException, IllegalStateException, SystemException {
+    public boolean enlistDistributedNonXAResource(Transaction transaction, TransactionalResource transactionalResource)
+            throws RollbackException, IllegalStateException, SystemException {
+        if (useLAO()) {
+            if (((JavaEETransactionManagerSimplified) javaEETransactionManager).resourceEnlistable(transactionalResource)) {
+                XAResource res = transactionalResource.getXAResource();
+                boolean result = transaction.enlistResource(res);
+                if (!transactionalResource.isEnlisted()) {
+                    transactionalResource.enlistedInTransaction(transaction);
+                }
+
+                return result;
+            }
 
-        if (tran instanceof JavaEETransaction) {
-            JavaEETransaction tx = (JavaEETransaction)tran;
-            ((JavaEETransactionManagerSimplified) javaEETM).startJTSTx(tx);
+            return true;
+        }
 
-            //If transaction conatains a NonXA and no LAO, convert the existing
-            //Non XA to LAO
-            if(useLAO()) {
-                if(h != null && (tx.getLAOResource() == null) ) {
-                    tx.setLAOResource(h);
-                    if (h.isTransactional()) {
-                        XAResource res = h.getXAResource();
-                        return tran.enlistResource(res);
+        throw new IllegalStateException(sm.getString("enterprise_distributedtx.nonxa_usein_jts"));
+    }
+
+    public boolean enlistLAOResource(Transaction transaction, TransactionalResource transactionalResource)
+            throws RollbackException, IllegalStateException, SystemException {
+        if (transaction instanceof JavaEETransaction) {
+            JavaEETransaction eeTransaction = (JavaEETransaction) transaction;
+            ((JavaEETransactionManagerSimplified) javaEETransactionManager).startJTSTx(eeTransaction);
+
+            // If transaction contains a NonXA and no LAO, convert the existing Non XA to LAO
+            if (useLAO()) {
+                if (transactionalResource != null && (eeTransaction.getLAOResource() == null)) {
+                    eeTransaction.setLAOResource(transactionalResource);
+                    if (transactionalResource.isTransactional()) {
+                        return transaction.enlistResource(transactionalResource.getXAResource());
                     }
                 }
             }
             return true;
-        } else {
-            // Should not be called
-            return false;
         }
 
+        // Should not be called
+        return false;
     }
 
-    public void setRollbackOnlyDistributedTransaction()
-            throws IllegalStateException, SystemException {
-        if (_logger.isLoggable(Level.FINE))
-                _logger.log(Level.FINE,"TM: setRollbackOnly");
+    public void setRollbackOnlyDistributedTransaction() throws IllegalStateException, SystemException {
+        _logger.log(FINE, "TM: setRollbackOnly");
 
         validateTransactionManager();
-        tmLocal.get().setRollbackOnly();
+        transactionManagerLocal.get().setRollbackOnly();
     }
 
     public Transaction suspend(JavaEETransaction tx) throws SystemException {
-        if ( tx != null ) {
-            if ( !tx.isLocalTx() )
+        if (tx != null) {
+            if (!tx.isLocalTx()) {
                 suspendXA();
+            }
 
-            javaEETM.setCurrentTransaction(null);
+            javaEETransactionManager.setCurrentTransaction(null);
             return tx;
-        } else if (tmLocal.get() != null) {
+        }
+
+        if (transactionManagerLocal.get() != null) {
             return suspendXA(); // probably a JTS imported tx
         }
 
         return null;
     }
 
-    public void resume(Transaction tx)
-        throws InvalidTransactionException, IllegalStateException,
-        SystemException {
-        if (_logger.isLoggable(Level.FINE))
-            _logger.log(Level.FINE,"TM: resume");
+    public void resume(Transaction tx) throws InvalidTransactionException, IllegalStateException, SystemException {
+        _logger.log(FINE, "TM: resume");
 
         if (transactionManagerImpl != null) {
             setTransactionManager();
-            tmLocal.get().resume(tx);
+            transactionManagerLocal.get().resume(tx);
         }
     }
 
-    public void removeTransaction(Transaction tx) {
-        globalTransactions.remove(tx);
+    public void removeTransaction(Transaction transaction) {
+        globalTransactions.remove(transaction);
     }
 
     public int getOrder() {
         return 3;
     }
 
-    public void setTransactionManager(JavaEETransactionManager tm) {
-        javaEETM = tm;
-        _logger = ((JavaEETransactionManagerSimplified)javaEETM).getLogger();
+    public void setTransactionManager(JavaEETransactionManager eeTransactionManager) {
+        javaEETransactionManager = eeTransactionManager;
+        _logger = ((JavaEETransactionManagerSimplified) javaEETransactionManager).getLogger();
     }
 
-    public TransactionInternal startJTSTx(JavaEETransaction tran, boolean isAssociatedTimeout)
+    public TransactionInternal startJTSTx(JavaEETransaction transaction, boolean isAssociatedTimeout)
             throws RollbackException, IllegalStateException, SystemException {
         setTransactionManager();
 
-        JavaEETransactionImpl tx = (JavaEETransactionImpl)tran;
+        JavaEETransactionImpl eeTransactionImpl = (JavaEETransactionImpl) transaction;
         try {
             if (isAssociatedTimeout) {
                 // calculate the timeout for the transaction, this is required as the local tx
                 // is getting converted to a global transaction
-                int timeout = tx.cancelTimerTask();
-                int newtimeout = (int) ((System.currentTimeMillis() - tx.getStartTime()) / 1000);
-                newtimeout = (timeout -   newtimeout);
+                int timeout = eeTransactionImpl.cancelTimerTask();
+                int newtimeout = (int) ((System.currentTimeMillis() - eeTransactionImpl.getStartTime()) / 1000);
+                newtimeout = (timeout - newtimeout);
                 beginJTS(newtimeout);
             } else {
-                beginJTS(((JavaEETransactionManagerSimplified)javaEETM).getEffectiveTimeout());
+                beginJTS(((JavaEETransactionManagerSimplified) javaEETransactionManager).getEffectiveTimeout());
             }
-        } catch ( NotSupportedException ex ) {
-            throw new RuntimeException(sm.getString("enterprise_distributedtx.lazy_transaction_notstarted"),ex);
+        } catch (NotSupportedException ex) {
+            throw new RuntimeException(sm.getString("enterprise_distributedtx.lazy_transaction_notstarted"), ex);
         }
 
-        TransactionInternal jtsTx = (TransactionInternal)tmLocal.get().getTransaction();
-        globalTransactions.put(jtsTx, tx);
+        TransactionInternal jtsTx = (TransactionInternal) transactionManagerLocal.get().getTransaction();
+        globalTransactions.put(jtsTx, eeTransactionImpl);
 
         return jtsTx;
     }
@@ -392,8 +379,7 @@ public void initRecovery(boolean force) {
 
     public void recover(XAResource[] resourceList) {
         setTransactionManager();
-        TransactionManagerImpl.recover(
-                Collections.enumeration(Arrays.asList(resourceList)));
+        TransactionManagerImpl.recover(enumeration(asList(resourceList)));
     }
 
     public void release(Xid xid) throws WorkException {
@@ -412,67 +398,65 @@ public XATerminator getXATerminator() {
     }
 
     private Transaction suspendXA() throws SystemException {
-        if (_logger.isLoggable(Level.FINE))
-            _logger.log(Level.FINE,"TM: suspend");
+        _logger.log(FINE, "TM: suspend");
+
         validateTransactionManager();
-        return tmLocal.get().suspend();
+        return transactionManagerLocal.get().suspend();
     }
 
     private void validateTransactionManager() throws IllegalStateException {
-        if (tmLocal.get() == null) {
-            throw new IllegalStateException
-            (sm.getString("enterprise_distributedtx.transaction_notactive"));
+        if (transactionManagerLocal.get() == null) {
+            throw new IllegalStateException(sm.getString("enterprise_distributedtx.transaction_notactive"));
         }
     }
 
     private void setTransactionManager() {
-        if (_logger.isLoggable(Level.FINE))
-            _logger.log(Level.FINE,"TM: setTransactionManager: tm=" + tmLocal.get());
+        if (_logger.isLoggable(FINE)) {
+            _logger.log(FINE, "TM: setTransactionManager: tm=" + transactionManagerLocal.get());
+        }
 
         if (transactionManagerImpl == null) {
-           transactionManagerImpl = TransactionManagerImpl.getTransactionManagerImpl();
+            transactionManagerImpl = TransactionManagerImpl.getTransactionManagerImpl();
         }
 
-        if (tmLocal.get() == null)
-            tmLocal.set(transactionManagerImpl);
+        if (transactionManagerLocal.get() == null) {
+            transactionManagerLocal.set(transactionManagerImpl);
+        }
     }
 
     public XAResourceWrapper getXAResourceWrapper(String clName) {
-        XAResourceWrapper rc = xaresourcewrappers.get(clName);
+        XAResourceWrapper xaResourceWrapper = xaresourcewrappers.get(clName);
 
-        if (rc != null)
-            return rc.getInstance();
+        if (xaResourceWrapper == null) {
+            return null;
+        }
 
-        return null;
+        return xaResourceWrapper.getInstance();
     }
 
     public void handlePropertyUpdate(String name, Object value) {
-        if (name.equals(ServerTags.KEYPOINT_INTERVAL)) {
-            Configuration.setKeypointTrigger(Integer.parseInt((String)value,10));
-
-        } else if (name.equals(ServerTags.RETRY_TIMEOUT_IN_SECONDS)) {
-            Configuration.setCommitRetryVar((String)value);
+        if (name.equals(KEYPOINT_INTERVAL)) {
+            Configuration.setKeypointTrigger(Integer.parseInt((String) value, 10));
 
+        } else if (name.equals(RETRY_TIMEOUT_IN_SECONDS)) {
+            Configuration.setCommitRetryVar((String) value);
         }
     }
 
-    public boolean recoverIncompleteTx(boolean delegated, String logPath,
-            XAResource[] xaresArray) throws Exception {
-        boolean result = false;
+    public boolean recoverIncompleteTx(boolean delegated, String logPath, XAResource[] xaresArray) throws Exception {
         if (!delegated) {
             RecoveryManager.recoverIncompleteTx(xaresArray);
-            result = true;
+            return true;
         }
-        else
-            result = DelegatedRecoveryManager.delegated_recover(logPath, xaresArray);
 
-        return result;
+        return DelegatedRecoveryManager.delegated_recover(logPath, xaresArray);
     }
 
     public void beginJTS(int timeout) throws NotSupportedException, SystemException {
-        TransactionManagerImpl tm = (TransactionManagerImpl)tmLocal.get();
-        tm.begin(timeout);
-        ((JavaEETransactionManagerSimplified)javaEETM).monitorTxBegin(tm.getTransaction());
+        TransactionManagerImpl transactionManagerImpl = (TransactionManagerImpl) transactionManagerLocal.get();
+        transactionManagerImpl.begin(timeout);
+
+        ((JavaEETransactionManagerSimplified) javaEETransactionManager).monitorTxBegin(transactionManagerImpl.getTransaction());
     }
 
     public boolean supportsXAResource() {
@@ -481,47 +465,42 @@ public boolean supportsXAResource() {
 
     public void initTransactionProperties() {
         if (serviceLocator != null) {
-            txnService = serviceLocator.getService(TransactionService.class,
-                    ServerEnvironment.DEFAULT_INSTANCE_NAME);
+            transactionService = serviceLocator.getService(TransactionService.class, ServerEnvironment.DEFAULT_INSTANCE_NAME);
 
-            if (txnService != null) {
-                String value = txnService.getPropertyValue("use-last-agent-optimization");
+            if (transactionService != null) {
+                String value = transactionService.getPropertyValue("use-last-agent-optimization");
                 if (value != null && "false".equals(value)) {
                     setUseLAO(false);
-                    if (_logger.isLoggable(Level.FINE))
-                        _logger.log(Level.FINE,"TM: LAO is disabled");
+                    if (_logger.isLoggable(FINE))
+                        _logger.log(FINE, "TM: LAO is disabled");
                 }
 
-                value = txnService.getPropertyValue("oracle-xa-recovery-workaround");
+                value = transactionService.getPropertyValue("oracle-xa-recovery-workaround");
                 if (value == null || "true".equals(value)) {
-                    xaresourcewrappers.put(
-                        "oracle.jdbc.xa.client.OracleXADataSource",
-                        new OracleXAResource());
+                    xaresourcewrappers.put("oracle.jdbc.xa.client.OracleXADataSource", new OracleXAResource());
                 }
 
-                if (Boolean.parseBoolean(txnService.getPropertyValue("sybase-xa-recovery-workaround"))) {
-                    xaresourcewrappers.put(
-                        "com.sybase.jdbc2.jdbc.SybXADataSource",
-                        new SybaseXAResource());
+                if (Boolean.parseBoolean(transactionService.getPropertyValue("sybase-xa-recovery-workaround"))) {
+                    xaresourcewrappers.put("com.sybase.jdbc2.jdbc.SybXADataSource", new SybaseXAResource());
                 }
 
-                if (Boolean.parseBoolean(txnService.getAutomaticRecovery())) {
+                if (Boolean.parseBoolean(transactionService.getAutomaticRecovery())) {
                     // If recovery on server startup is set, initialize other properties as well
                     Properties props = TransactionServiceProperties.getJTSProperties(serviceLocator, false);
                     DefaultTransactionService.setServerName(props);
 
-                    if (Boolean.parseBoolean(txnService.getPropertyValue("delegated-recovery"))) {
+                    if (Boolean.parseBoolean(transactionService.getPropertyValue("delegated-recovery"))) {
                         // Register GMS notification callback
-                        if (_logger.isLoggable(Level.FINE))
-                            _logger.log(Level.FINE,"TM: Registering for GMS notification callback");
+                        if (_logger.isLoggable(FINE))
+                            _logger.log(FINE, "TM: Registering for GMS notification callback");
 
                         int waitTime = 60;
-                        value = txnService.getPropertyValue("wait-time-before-recovery-insec");
+                        value = transactionService.getPropertyValue("wait-time-before-recovery-insec");
                         if (value != null) {
                             try {
                                 waitTime = Integer.parseInt(value);
-                            } catch(Exception e) {
-                                _logger.log(Level.WARNING,"error_wait_time_before_recovery",e);
+                            } catch (Exception e) {
+                                _logger.log(Level.WARNING, "error_wait_time_before_recovery", e);
                             }
                         }
                         new GMSCallBack(waitTime, serviceLocator);
@@ -532,34 +511,31 @@ public void initTransactionProperties() {
     }
 
     /**
-     * Return true if a "null transaction context" was received
-     * from the client. See EJB2.0 spec section 19.6.2.1.
-     * A null tx context has no Coordinator objref. It indicates
-     * that the client had an active
-     * tx but the client container did not support tx interop.
+     * Return true if a "null transaction context" was received from the client. See EJB2.0 spec section 19.6.2.1. A null tx
+     * context has no Coordinator objref. It indicates that the client had an active tx but the client container did not
+     * support tx interop.
      */
     public boolean isNullTransaction() {
         try {
             return com.sun.jts.pi.InterceptorImpl.isTxCtxtNull();
-        } catch ( Exception ex ) {
+        } catch (Exception ex) {
             // sometimes JTS throws an EmptyStackException if isTxCtxtNull
             // is called outside of any CORBA invocation.
             return false;
         }
     }
 
-    public TransactionAdminBean getTransactionAdminBean(Transaction t)
-            throws jakarta.transaction.SystemException {
+    public TransactionAdminBean getTransactionAdminBean(Transaction t) throws jakarta.transaction.SystemException {
         TransactionAdminBean tBean = null;
-        if(t instanceof com.sun.jts.jta.TransactionImpl) {
-            String id = ((com.sun.jts.jta.TransactionImpl)t).getTransactionId();
-            long startTime = ((com.sun.jts.jta.TransactionImpl)t).getStartTime();
+        if (t instanceof com.sun.jts.jta.TransactionImpl) {
+            String id = ((com.sun.jts.jta.TransactionImpl) t).getTransactionId();
+            long startTime = ((com.sun.jts.jta.TransactionImpl) t).getStartTime();
             long elapsedTime = System.currentTimeMillis() - startTime;
             String status = JavaEETransactionManagerSimplified.getStatusAsString(t.getStatus());
 
-            JavaEETransactionImpl tran = (JavaEETransactionImpl)globalTransactions.get(t);
-            if(tran != null) {
-                tBean = ((JavaEETransactionManagerSimplified)javaEETM).getTransactionAdminBean(tran);
+            JavaEETransactionImpl tran = (JavaEETransactionImpl) globalTransactions.get(t);
+            if (tran != null) {
+                tBean = ((JavaEETransactionManagerSimplified) javaEETransactionManager).getTransactionAdminBean(tran);
 
                 // Override with JTS values
                 tBean.setIdentifier(t);
@@ -570,17 +546,17 @@ public TransactionAdminBean getTransactionAdminBean(Transaction t)
                     tBean.setComponentName("unknown");
                 }
             } else {
-                tBean = new TransactionAdminBean(t, id, status, elapsedTime,
-                                             "unknown", null);
+                tBean = new TransactionAdminBean(t, id, status, elapsedTime, "unknown", null);
             }
         } else {
-            tBean = ((JavaEETransactionManagerSimplified)javaEETM).getTransactionAdminBean(t);
+            tBean = ((JavaEETransactionManagerSimplified) javaEETransactionManager).getTransactionAdminBean(t);
         }
         return tBean;
     }
 
-    /** {@inheritDoc}
-    */
+    /**
+     * {@inheritDoc}
+     */
     public String getTxLogLocation() {
         if (Configuration.getServerName() == null) {
             // If server name is null, the properties were not fully initialized
@@ -588,15 +564,14 @@ public String getTxLogLocation() {
             DefaultTransactionService.setServerName(props);
         }
 
-        return Configuration.getDirectory(Configuration.LOG_DIRECTORY,
-                                                 Configuration.JTS_SUBDIRECTORY,
-                                                 new int[1]);
+        return Configuration.getDirectory(Configuration.LOG_DIRECTORY, Configuration.JTS_SUBDIRECTORY, new int[1]);
     }
 
-    /** {@inheritDoc}
-    */
+    /**
+     * {@inheritDoc}
+     */
     public void registerRecoveryResourceHandler(XAResource xaResource) {
-            ResourceRecoveryManagerImpl.registerRecoveryResourceHandler(xaResource);
+        ResourceRecoveryManagerImpl.registerRecoveryResourceHandler(xaResource);
     }
 
     public Lock getReadLock() {
@@ -604,32 +579,29 @@ public Lock getReadLock() {
     }
 
     public void acquireWriteLock() {
-        if(com.sun.jts.CosTransactions.AdminUtil.isFrozenAll()){
-            //multiple freezes will hang this thread, therefore just return
+        if (com.sun.jts.CosTransactions.AdminUtil.isFrozenAll()) {
+            // multiple freezes will hang this thread, therefore just return
             return;
         }
         com.sun.jts.CosTransactions.AdminUtil.freezeAll();
 
-/** XXX Do we need to check twice? XXX **
-        if(lock.isWriteLocked()){
-            //multiple freezes will hang this thread, therefore just return
-            return;
-        }
-** XXX Do we need to check twice? XXX **/
+        /**
+         * XXX Do we need to check twice? XXX ** if(lock.isWriteLocked()){ //multiple freezes will hang this thread, therefore
+         * just return return; } XXX Do we need to check twice? XXX
+         **/
 
         lock.acquireWriteLock();
     }
 
     public void releaseWriteLock() {
-        if(com.sun.jts.CosTransactions.AdminUtil.isFrozenAll()){
+        if (com.sun.jts.CosTransactions.AdminUtil.isFrozenAll()) {
             com.sun.jts.CosTransactions.AdminUtil.unfreezeAll();
         }
 
-/** XXX Do we need to check twice? XXX **
-        if(lock.isWriteLocked()){
-            lock.releaseWriteLock();
-        }
-** XXX Do we need to check twice? XXX **/
+        /**
+         * XXX Do we need to check twice? XXX ** if(lock.isWriteLocked()){ lock.releaseWriteLock(); } XXX Do we need to check
+         * twice? XXX
+         **/
 
         lock.releaseWriteLock();
     }
@@ -675,12 +647,11 @@ public void lockInterruptibly() throws InterruptedException {
             throw new UnsupportedOperationException();
         }
 
-        public  boolean tryLock() {
+        public boolean tryLock() {
             throw new UnsupportedOperationException();
         }
 
-        public boolean tryLock(long timeout, TimeUnit unit)
-                throws InterruptedException {
+        public boolean tryLock(long timeout, TimeUnit unit) throws InterruptedException {
             throw new UnsupportedOperationException();
         }
 
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java
index 59edfda5893..a61484df8f4 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/ResourceRecoveryManagerImpl.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,8 +17,11 @@
 
 package com.sun.enterprise.transaction.jts;
 
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.SEVERE;
+import static java.util.logging.Level.WARNING;
+
 import java.util.*;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import jakarta.inject.Inject;
 import javax.transaction.xa.XAResource;
@@ -52,52 +56,51 @@
 @Service
 public class ResourceRecoveryManagerImpl implements PostConstruct, ResourceRecoveryManager {
 
-    private TransactionService txnService;
+    private static Logger _logger = LogDomains.getLogger(JavaEETransactionManagerSimplified.class, LogDomains.JTA_LOGGER);
+    private static StringManager localStrings = StringManager.getManager(JavaEETransactionManagerSimplified.class);
+
+    // Externally registered (ie not via habitat.getAllByContract) ResourceHandlers
+    private static List<RecoveryResourceHandler> externallyRegisteredRecoveryResourceHandlers = new ArrayList<>();
 
     @Inject
-    private ServiceLocator habitat;
+    private ServiceLocator serviceLocator;
 
-    private JavaEETransactionManager txMgr;
+    private TransactionService transactionService;
+    private JavaEETransactionManager eeTransactionManager;
 
     private Collection<RecoveryResourceHandler> recoveryResourceHandlers;
 
     private RecoveryResourceRegistry recoveryListenersRegistry;
 
-    private static Logger _logger =
-            LogDomains.getLogger(JavaEETransactionManagerSimplified.class,
-            LogDomains.JTA_LOGGER);
-    private static StringManager localStrings =
-            StringManager.getManager(JavaEETransactionManagerSimplified.class);
-
-    private volatile boolean lazyRecovery = false;
-    private volatile boolean configured = false;
-    // Externally registered (ie not via habitat.getAllByContract) ResourceHandlers
-    private static List externallyRegisteredRecoveryResourceHandlers = new ArrayList();
-
+    private volatile boolean lazyRecovery;
+    private volatile boolean configured;
 
     public void postConstruct() {
         if (configured) {
-            _logger.log(Level.WARNING, "", new IllegalStateException());
+            _logger.log(WARNING, "", new IllegalStateException());
             return;
         }
+
         // Recover XA resources if the auto-recovery flag in tx service is set to true
         recoverXAResources();
     }
 
     /**
      * recover incomplete transactions
+     *
      * @param delegated indicates whether delegated recovery is needed
      * @param logPath transaction log directory path
      * @return boolean indicating the status of transaction recovery
      * @throws Exception when unable to recover
      */
     public boolean recoverIncompleteTx(boolean delegated, String logPath) throws Exception {
-        return recoverIncompleteTx(delegated, logPath,
-                ((delegated)? null : Configuration.getPropertyValue(Configuration.INSTANCE_NAME)), false);
+        return recoverIncompleteTx(delegated, logPath, ((delegated) ? null : Configuration.getPropertyValue(Configuration.INSTANCE_NAME)),
+                false);
     }
 
     /**
      * recover incomplete transactions
+     *
      * @param delegated indicates whether delegated recovery is needed
      * @param logPath transaction log directory path
      * @param instance the name of the instance for which delegated recovery is performed, null if unknown.
@@ -105,14 +108,12 @@ public boolean recoverIncompleteTx(boolean delegated, String logPath) throws Exc
      * @return boolean indicating the status of transaction recovery
      * @throws Exception when unable to recover
      */
-    public boolean recoverIncompleteTx(boolean delegated, String logPath, String instance,
-            boolean notifyRecoveryListeners) throws Exception {
+    public boolean recoverIncompleteTx(boolean delegated, String logPath, String instance, boolean notifyRecoveryListeners)
+            throws Exception {
         boolean result = false;
         Map<RecoveryResourceHandler, Vector> handlerToXAResourcesMap = null;
         try {
-            if (_logger.isLoggable(Level.FINE)) {
-                _logger.log(Level.FINE, "Performing recovery of incomplete Tx...");
-            }
+            _logger.log(FINE, "Performing recovery of incomplete Tx...");
 
             configure();
             if (notifyRecoveryListeners) {
@@ -121,7 +122,7 @@ public boolean recoverIncompleteTx(boolean delegated, String logPath, String ins
 
             Vector xaresList = new Vector();
 
-            //TODO V3 will handle ThirdPartyXAResources also (v2 is not so). Is this fine ?
+            // TODO V3 will handle ThirdPartyXAResources also (v2 is not so). Is this fine ?
             handlerToXAResourcesMap = getAllRecoverableResources(xaresList);
 
             int size = xaresList.size();
@@ -129,11 +130,12 @@ public boolean recoverIncompleteTx(boolean delegated, String logPath, String ins
             for (int i = 0; i < size; i++) {
                 xaresArray[i] = (XAResource) xaresList.elementAt(i);
             }
-            if (_logger.isLoggable(Level.FINE)) {
-                String msg = localStrings.getStringWithDefault("xaresource.recovering",
-                        "Recovering {0} XA resources...", new Object[] {String.valueOf(size)});
 
-                _logger.log(Level.FINE, msg);
+            if (_logger.isLoggable(FINE)) {
+                String msg = localStrings.getStringWithDefault("xaresource.recovering", "Recovering {0} XA resources...",
+                        new Object[] { String.valueOf(size) });
+
+                _logger.log(FINE, msg);
             }
             if (!delegated) {
                 RecoveryManager.recoverIncompleteTx(xaresArray);
@@ -144,13 +146,13 @@ public boolean recoverIncompleteTx(boolean delegated, String logPath, String ins
 
             return result;
         } catch (Exception ex1) {
-            _logger.log(Level.WARNING, "xaresource.recover_error", ex1);
+            _logger.log(WARNING, "xaresource.recover_error", ex1);
             throw ex1;
         } finally {
             try {
                 closeAllResources(handlerToXAResourcesMap);
             } catch (Exception ex1) {
-                _logger.log(Level.WARNING, "xaresource.recover_error", ex1);
+                _logger.log(WARNING, "xaresource.recover_error", ex1);
             }
             if (notifyRecoveryListeners) {
                 afterRecovery(result, delegated, instance);
@@ -160,6 +162,7 @@ public boolean recoverIncompleteTx(boolean delegated, String logPath, String ins
 
     /**
      * close all resources provided using their handlers
+     *
      * @param resourcesToHandlers map that holds handlers and their resources
      */
     private void closeAllResources(Map<RecoveryResourceHandler, Vector> resourcesToHandlers) {
@@ -175,15 +178,15 @@ private void closeAllResources(Map<RecoveryResourceHandler, Vector> resourcesToH
 
     /**
      * get all recoverable resources
+     *
      * @param xaresList xa resources
      * @return recovery-handlers and their resources
      */
     private Map<RecoveryResourceHandler, Vector> getAllRecoverableResources(Vector xaresList) {
-        Map<RecoveryResourceHandler, Vector> resourcesToHandlers =
-                new HashMap<RecoveryResourceHandler, Vector>();
+        Map<RecoveryResourceHandler, Vector> resourcesToHandlers = new HashMap<RecoveryResourceHandler, Vector>();
 
         for (RecoveryResourceHandler handler : recoveryResourceHandlers) {
-            //TODO V3 FINE LOG
+            // TODO V3 FINE LOG
             Vector resources = new Vector();
             handler.loadXAResourcesAndItsConnections(xaresList, resources);
             resourcesToHandlers.put(handler, resources);
@@ -193,28 +196,26 @@ private Map<RecoveryResourceHandler, Vector> getAllRecoverableResources(Vector x
 
     /**
      * recover the xa-resources
+     *
      * @param force boolean to indicate if it has to be forced.
      */
     public void recoverXAResources(boolean force) {
         if (force) {
             try {
-                if (txnService == null) {
-                    Config c = habitat.getService(Config.class, ServerEnvironment.DEFAULT_INSTANCE_NAME);
-                    txnService = c.getExtensionByType(TransactionService.class);
+                if (transactionService == null) {
+                    transactionService = serviceLocator.getService(Config.class, ServerEnvironment.DEFAULT_INSTANCE_NAME)
+                                                       .getExtensionByType(TransactionService.class);
                 }
-                if (!Boolean.valueOf(txnService.getAutomaticRecovery())) {
+                if (!Boolean.valueOf(transactionService.getAutomaticRecovery())) {
                     return;
                 }
-                if (_logger.isLoggable(Level.FINE)) {
-                    _logger.log(Level.FINE, "ejbserver.recovery",
-                            "Perform recovery of XAResources...");
-                }
+
+                _logger.log(FINE, "ejbserver.recovery", "Perform recovery of XAResources...");
 
                 configure();
 
                 Vector xaresList = new Vector();
-                Map<RecoveryResourceHandler, Vector> resourcesToHandler =
-                        getAllRecoverableResources(xaresList);
+                Map<RecoveryResourceHandler, Vector> resourcesToHandler = getAllRecoverableResources(xaresList);
 
                 int size = xaresList.size();
                 XAResource[] xaresArray = new XAResource[size];
@@ -223,18 +224,18 @@ public void recoverXAResources(boolean force) {
                 }
 
                 resourceRecoveryStarted();
-                if (_logger.isLoggable(Level.FINE)) {
-                    String msg = localStrings.getStringWithDefault("xaresource.recovering",
-                        "Recovering {0} XA resources...", new Object[]{String.valueOf(size)});
+                if (_logger.isLoggable(FINE)) {
+                    String msg = localStrings.getStringWithDefault("xaresource.recovering", "Recovering {0} XA resources...",
+                            new Object[] { String.valueOf(size) });
 
-                    _logger.log(Level.FINE, msg);
+                    _logger.log(FINE, msg);
                 }
-                txMgr.recover(xaresArray);
+                eeTransactionManager.recover(xaresArray);
                 resourceRecoveryCompleted();
 
                 closeAllResources(resourcesToHandler);
             } catch (Exception ex) {
-                _logger.log(Level.SEVERE, "xaresource.recover_error", ex);
+                _logger.log(SEVERE, "xaresource.recover_error", ex);
             }
         }
     }
@@ -243,11 +244,8 @@ public void recoverXAResources(boolean force) {
      * notifies the resource listeners that recovery has started
      */
     private void resourceRecoveryStarted() {
-        Set<RecoveryResourceListener> listeners =
-                recoveryListenersRegistry.getListeners();
-
-        for (RecoveryResourceListener rrl : listeners) {
-            rrl.recoveryStarted();
+        for (RecoveryResourceListener listener : recoveryListenersRegistry.getListeners()) {
+            listener.recoveryStarted();
         }
     }
 
@@ -255,11 +253,8 @@ private void resourceRecoveryStarted() {
      * notifies the resource listeners that recovery has completed
      */
     private void resourceRecoveryCompleted() {
-        Set<RecoveryResourceListener> listeners =
-                recoveryListenersRegistry.getListeners();
-
-        for (RecoveryResourceListener rrl : listeners) {
-            rrl.recoveryCompleted();
+        for (RecoveryResourceListener listeners : recoveryListenersRegistry.getListeners()) {
+            listeners.recoveryCompleted();
         }
     }
 
@@ -267,15 +262,12 @@ private void resourceRecoveryCompleted() {
      * notifies the event listeners that recovery is about to start
      */
     private void beforeRecovery(boolean delegated, String instance) {
-        Set<RecoveryEventListener> listeners =
-                recoveryListenersRegistry.getEventListeners();
-
-        for (RecoveryEventListener erl : listeners) {
+        for (RecoveryEventListener listener : recoveryListenersRegistry.getEventListeners()) {
             try {
-                erl.beforeRecovery(delegated, instance);
+                listener.beforeRecovery(delegated, instance);
             } catch (Throwable e) {
-                _logger.log(Level.WARNING, "", e);
-                _logger.log(Level.WARNING, "jts.before_recovery_excep", e);
+                _logger.log(WARNING, "", e);
+                _logger.log(WARNING, "jts.before_recovery_excep", e);
             }
         }
     }
@@ -284,15 +276,12 @@ private void beforeRecovery(boolean delegated, String instance) {
      * notifies the event listeners that all recovery operations are completed
      */
     private void afterRecovery(boolean success, boolean delegated, String instance) {
-        Set<RecoveryEventListener> listeners =
-                recoveryListenersRegistry.getEventListeners();
-
-        for (RecoveryEventListener erl : listeners) {
+        for (RecoveryEventListener listener : recoveryListenersRegistry.getEventListeners()) {
             try {
-                erl.afterRecovery(success, delegated, instance);
+                listener.afterRecovery(success, delegated, instance);
             } catch (Throwable e) {
-                _logger.log(Level.WARNING, "", e);
-                _logger.log(Level.WARNING, "jts.after_recovery_excep", e);
+                _logger.log(WARNING, "", e);
+                _logger.log(WARNING, "jts.after_recovery_excep", e);
             }
         }
     }
@@ -318,28 +307,30 @@ private void configure() {
             return;
         }
 
-        recoveryResourceHandlers = new ArrayList(habitat.getAllServices(RecoveryResourceHandler.class));
+        recoveryResourceHandlers = new ArrayList<>(serviceLocator.getAllServices(RecoveryResourceHandler.class));
         recoveryResourceHandlers.addAll(externallyRegisteredRecoveryResourceHandlers);
-        txMgr = habitat.getService(JavaEETransactionManager.class);
-        recoveryListenersRegistry = habitat.getService(RecoveryResourceRegistry.class);
-        if (recoveryListenersRegistry == null) throw new IllegalStateException();
+        eeTransactionManager = serviceLocator.getService(JavaEETransactionManager.class);
+        recoveryListenersRegistry = serviceLocator.getService(RecoveryResourceRegistry.class);
+
+        if (recoveryListenersRegistry == null) {
+            throw new IllegalStateException();
+        }
+
         RecoveryManager.startTransactionRecoveryFence();
 
         configured = true;
     }
 
-
     public static void registerRecoveryResourceHandler(final XAResource xaResource) {
-        RecoveryResourceHandler recoveryResourceHandler =
-                new RecoveryResourceHandler() {
-                    public void loadXAResourcesAndItsConnections(List xaresList, List connList) {
-                        xaresList.add(xaResource);
-                    }
-
-                    public void closeConnections(List connList) {
-                        ;
-                    }
-                };
+        RecoveryResourceHandler recoveryResourceHandler = new RecoveryResourceHandler() {
+            public void loadXAResourcesAndItsConnections(List xaresList, List connList) {
+                xaresList.add(xaResource);
+            }
+
+            public void closeConnections(List connList) {
+                ;
+            }
+        };
         externallyRegisteredRecoveryResourceHandlers.add(recoveryResourceHandler);
     }
 }
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/api/DelegatedTransactionRecoveryFence.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/api/DelegatedTransactionRecoveryFence.java
index f9b085f5965..bf26289cbf1 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/api/DelegatedTransactionRecoveryFence.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/api/DelegatedTransactionRecoveryFence.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -27,32 +28,30 @@
 
 public interface DelegatedTransactionRecoveryFence {
     /**
-     * Returns true if the specified instance on the specified path is being recovered
-     * after the specified timestamp
+     * Returns true if the specified instance on the specified path is being recovered after the specified timestamp
      */
-    public boolean isFenceRaised(String path, String instanceName, long timestamp);
+    boolean isFenceRaised(String path, String instanceName, long timestamp);
 
     /**
-     * Raise the fence for the specified instance on the specified path so that no other instance can
-     * start delegated recovery at the same time.
+     * Raise the fence for the specified instance on the specified path so that no other instance can start delegated
+     * recovery at the same time.
      */
-    public void raiseFence(String path, String instanceName);
+    void raiseFence(String path, String instanceName);
 
     /**
      * Lower the fence for the specified instance on the specified path
      */
-    public void lowerFence(String path, String instanceName);
+    void lowerFence(String path, String instanceName);
 
     /**
-     * Returns instance for which delegated recovery was done before the timestamp specified
-     * on the specified path or null if such instance does not exist
+     * Returns instance for which delegated recovery was done before the timestamp specified on the specified path or null
+     * if such instance does not exist
      */
-    public String getInstanceRecoveredFor(String path, long timestamp);
+    String getInstanceRecoveredFor(String path, long timestamp);
 
     /**
-     * If an instance was doing delegated recovery on the specified path, assign
-     * specified instance instead.
+     * If an instance was doing delegated recovery on the specified path, assign specified instance instead.
      */
-    public void transferRecoveryTo(String path, String instanceName);
+    void transferRecoveryTo(String path, String instanceName);
 
 }
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/api/TransactionRecoveryFence.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/api/TransactionRecoveryFence.java
index 0a961bf1821..09c58dd6f12 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/api/TransactionRecoveryFence.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/api/TransactionRecoveryFence.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -28,18 +29,18 @@
 
 public interface TransactionRecoveryFence {
     /**
-     * DataStructures are initialized first. Recovery
-     * of transaction starts immediatley after the initialization.
+     * DataStructures are initialized first. Recovery of transaction starts immediately after the initialization.
      */
-    public void start();
+    void start();
+
     /**
-     * Raise the fence so that no other instance can
-     * start the recovery at the same time.
+     * Raise the fence so that no other instance can start the recovery at the same time.
      */
-    public void raiseFence();
+    void raiseFence();
+
     /**
      * Lower the fence
      */
-    public void lowerFence();
+    void lowerFence();
 
 }
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
index ed1f2a81d66..a0bf653d09c 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -20,70 +21,85 @@
 import org.omg.CORBA.LocalObject;
 import org.omg.PortableInterceptor.ClientRequestInfo;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 
+import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
 
 public class TransactionClientInterceptor extends LocalObject
         implements ClientRequestInterceptor, Comparable<TransactionClientInterceptor> {
 
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
     private String name;
     private int order;
 
-    private JavaEETransactionManager tm;
+    private JavaEETransactionManager eeTransactionManager;
 
     /**
      * Create the interceptor.
+     *
      * @param the name of the interceptor.
      * @param the order in which the interceptor should be invoked.
      */
-    public TransactionClientInterceptor(String name, int order, ServiceLocator habitat) {
+    public TransactionClientInterceptor(String name, int order, ServiceLocator serviceLocator) {
         this.name = name;
         this.order = order;
-        tm = habitat.getService(JavaEETransactionManager.class);
+        eeTransactionManager = serviceLocator.getService(JavaEETransactionManager.class);
     }
 
+    @Override
     public int compareTo(TransactionClientInterceptor o) {
         int otherOrder = o.order;
 
         if (order < otherOrder) {
             return -1;
-        } else if (order == otherOrder) {
+        }
+
+        if (order == otherOrder) {
             return 0;
         }
+
         return 1;
     }
 
     /**
      * Return the name of the interceptor.
+     *
      * @return the name of the interceptor.
      */
+    @Override
     public String name() {
         return name;
     }
 
-
-    public void send_request(ClientRequestInfo cri) {
+    @Override
+    public void send_request(ClientRequestInfo clientRequestInfo) {
         // Check if there is an exportable transaction on current thread
-        Object target = cri.effective_target();
-        if (tm != null) {
-            tm.checkTransactionExport(StubAdapter.isLocal(target));
+        Object target = clientRequestInfo.effective_target();
+        if (eeTransactionManager != null) {
+            eeTransactionManager.checkTransactionExport(StubAdapter.isLocal(target));
         }
     }
 
+    @Override
     public void destroy() {
     }
 
+    @Override
     public void send_poll(ClientRequestInfo cri) {
     }
 
+    @Override
     public void receive_reply(ClientRequestInfo cri) {
     }
 
+    @Override
     public void receive_exception(ClientRequestInfo cri) {
     }
 
+    @Override
     public void receive_other(ClientRequestInfo cri) {
     }
 }
-
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java
index 0532a157aab..a8c7332d69c 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionIIOPInterceptorFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -17,55 +18,55 @@
 package com.sun.enterprise.transaction.jts.iiop;
 
 import java.util.Properties;
-import java.util.logging.Logger;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
-import com.sun.jts.pi.InterceptorImpl;
-import com.sun.jts.jta.TransactionServiceProperties;
-import com.sun.jts.CosTransactions.Configuration;
-import com.sun.jts.CosTransactions.DefaultTransactionService;
-
-import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory;
 import org.glassfish.api.admin.ProcessEnvironment;
-import com.sun.logging.LogDomains;
-
-import jakarta.inject.Inject;
-import org.jvnet.hk2.annotations.Service;
+import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory;
 import org.glassfish.hk2.api.ServiceLocator;
-
-import org.glassfish.pfl.basic.func.NullaryFunction ;
-
-import org.omg.CORBA.*;
+import org.glassfish.pfl.basic.func.NullaryFunction;
+import org.jvnet.hk2.annotations.Service;
+import org.omg.CORBA.CompletionStatus;
+import org.omg.CORBA.INITIALIZE;
 import org.omg.IOP.Codec;
-import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
+import org.omg.PortableInterceptor.Current;
 import org.omg.PortableInterceptor.ORBInitInfo;
 import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
-import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.corba.ee.impl.txpoa.TSIdentificationImpl;
 import com.sun.corba.ee.spi.legacy.interceptor.ORBInitInfoExt;
 import com.sun.corba.ee.spi.logging.POASystemException;
-import com.sun.corba.ee.impl.txpoa.TSIdentificationImpl;
+import com.sun.corba.ee.spi.misc.ORBConstants;
+import com.sun.jts.CosTransactions.Configuration;
+import com.sun.jts.CosTransactions.DefaultTransactionService;
+import com.sun.jts.jta.TransactionServiceProperties;
+import com.sun.jts.pi.InterceptorImpl;
+import com.sun.logging.LogDomains;
+
+import jakarta.inject.Inject;
 
 /**
  *
  * @author mvatkina
  */
-@Service(name="TransactionIIOPInterceptorFactory")
-public class TransactionIIOPInterceptorFactory implements IIOPInterceptorFactory{
+@Service(name = "TransactionIIOPInterceptorFactory")
+public class TransactionIIOPInterceptorFactory implements IIOPInterceptorFactory {
 
     // The log message bundle is in com.sun.jts package
-    private static Logger _logger =
-            LogDomains.getLogger(InterceptorImpl.class, LogDomains.TRANSACTION_LOGGER);
+    private static Logger _logger = LogDomains.getLogger(InterceptorImpl.class, LogDomains.TRANSACTION_LOGGER);
 
     private static Properties jtsProperties = new Properties();
     private static TSIdentificationImpl tsIdent = new TSIdentificationImpl();
     private static boolean txServiceInitialized = false;
     private InterceptorImpl interceptor = null;
 
-    @Inject private ServiceLocator serviceLocator;
-    @Inject private ProcessEnvironment processEnv;
+    @Inject
+    private ServiceLocator serviceLocator;
+    @Inject
+    private ProcessEnvironment processEnv;
 
+    @Override
     public ClientRequestInterceptor createClientRequestInterceptor(ORBInitInfo info, Codec codec) {
         if (!txServiceInitialized) {
             createInterceptor(info, codec);
@@ -74,6 +75,7 @@ public ClientRequestInterceptor createClientRequestInterceptor(ORBInitInfo info,
         return interceptor;
     }
 
+    @Override
     public ServerRequestInterceptor createServerRequestInterceptor(ORBInitInfo info, Codec codec) {
         if (!txServiceInitialized) {
             createInterceptor(info, codec);
@@ -83,12 +85,11 @@ public ServerRequestInterceptor createServerRequestInterceptor(ORBInitInfo info,
     }
 
     private void createInterceptor(ORBInitInfo info, Codec codec) {
-        if( processEnv.getProcessType().isServer()) {
+        if (processEnv.getProcessType().isServer()) {
             try {
-                System.setProperty(
-                        InterceptorImpl.CLIENT_POLICY_CHECKING, String.valueOf(false));
-            } catch ( Exception ex ) {
-                _logger.log(Level.WARNING,"iiop.readproperty_exception",ex);
+                System.setProperty(InterceptorImpl.CLIENT_POLICY_CHECKING, String.valueOf(false));
+            } catch (Exception ex) {
+                _logger.log(Level.WARNING, "iiop.readproperty_exception", ex);
             }
 
             initJTSProperties(true);
@@ -99,7 +100,7 @@ private void createInterceptor(ORBInitInfo info, Codec codec) {
         try {
             // register JTS interceptors
             // first get hold of PICurrent to allocate a slot for JTS service.
-            Current pic = (Current)info.resolve_initial_references("PICurrent");
+            Current pic = (Current) info.resolve_initial_references("PICurrent");
 
             // allocate a PICurrent slotId for the transaction service.
             int[] slotIds = new int[2];
@@ -109,31 +110,29 @@ private void createInterceptor(ORBInitInfo info, Codec codec) {
             interceptor = new InterceptorImpl(pic, codec, slotIds, null);
             // Get the ORB instance on which this interceptor is being
             // initialized
-            com.sun.corba.ee.spi.orb.ORB theORB = ((ORBInitInfoExt)info).getORB();
+            com.sun.corba.ee.spi.orb.ORB theORB = ((ORBInitInfoExt) info).getORB();
 
             // Set ORB and TSIdentification: needed for app clients,
             // standalone clients.
             interceptor.setOrb(theORB);
             try {
                 DefaultTransactionService jts = new DefaultTransactionService();
-                jts.identify_ORB(theORB, tsIdent, jtsProperties ) ;
+                jts.identify_ORB(theORB, tsIdent, jtsProperties);
                 interceptor.setTSIdentification(tsIdent);
 
                 // V2-XXX should jts.get_current() be called everytime
                 // resolve_initial_references is called ??
                 org.omg.CosTransactions.Current transactionCurrent = jts.get_current();
 
-                theORB.getLocalResolver().register( ORBConstants.TRANSACTION_CURRENT_NAME,
-                        NullaryFunction.Factory.makeConstant(
-                        (org.omg.CORBA.Object)transactionCurrent));
+                theORB.getLocalResolver().register(ORBConstants.TRANSACTION_CURRENT_NAME,
+                        NullaryFunction.Factory.makeConstant((org.omg.CORBA.Object) transactionCurrent));
 
                 // the JTS PI use this to call the proprietary hooks
-                theORB.getLocalResolver().register( "TSIdentification",
-                        NullaryFunction.Factory.makeConstant((org.omg.CORBA.Object)tsIdent));
+                theORB.getLocalResolver().register("TSIdentification",
+                        NullaryFunction.Factory.makeConstant((org.omg.CORBA.Object) tsIdent));
                 txServiceInitialized = true;
             } catch (Exception ex) {
-                throw new INITIALIZE("JTS Exception: " + ex,
-                        POASystemException.JTS_INIT_ERROR, CompletionStatus.COMPLETED_MAYBE);
+                throw new INITIALIZE("JTS Exception: " + ex, POASystemException.JTS_INIT_ERROR, CompletionStatus.COMPLETED_MAYBE);
             }
 
             // Add IOR Interceptor only for OTS tagged components
@@ -141,8 +140,8 @@ private void createInterceptor(ORBInitInfo info, Codec codec) {
             info.add_ior_interceptor(iorInterceptor);
 
         } catch (Exception e) {
-            if(_logger.isLoggable(Level.FINE)){
-                _logger.log(Level.FINE,"Exception registering JTS interceptors",e);
+            if (_logger.isLoggable(Level.FINE)) {
+                _logger.log(Level.FINE, "Exception registering JTS interceptors", e);
             }
             throw new RuntimeException(e.getMessage());
         }
@@ -152,9 +151,7 @@ private void initJTSProperties(boolean isServer) {
         if (serviceLocator != null) {
             jtsProperties = TransactionServiceProperties.getJTSProperties(serviceLocator, true);
             if (_logger.isLoggable(Level.FINE)) {
-                _logger.log(Level.FINE,
-                            "++++ Server id: "
-                            + jtsProperties.getProperty(ORBConstants.ORB_SERVER_ID_PROPERTY));
+                _logger.log(Level.FINE, "++++ Server id: " + jtsProperties.getProperty(ORBConstants.ORB_SERVER_ID_PROPERTY));
             }
             if (isServer) {
                 Configuration.setProperties(jtsProperties);
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java
index 0dddb83239c..1ed0ede3d04 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionInterceptorFactory.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,30 +17,30 @@
 
 package com.sun.enterprise.transaction.jts.iiop;
 
-
 import org.glassfish.enterprise.iiop.api.IIOPInterceptorFactory;
 import org.glassfish.hk2.api.ServiceLocator;
-
-import jakarta.inject.Inject;
 import org.jvnet.hk2.annotations.Service;
-
 import org.omg.IOP.Codec;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
-import org.omg.PortableInterceptor.ServerRequestInterceptor;
 import org.omg.PortableInterceptor.ORBInitInfo;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
+
+import jakarta.inject.Inject;
 
 /**
  *
  * @author mvatkina
  */
-@Service(name="TransactionInterceptorFactory")
-public class TransactionInterceptorFactory implements IIOPInterceptorFactory{
+@Service(name = "TransactionInterceptorFactory")
+public class TransactionInterceptorFactory implements IIOPInterceptorFactory {
 
     private TransactionServerInterceptor tsi = null;
     private TransactionClientInterceptor tci = null;
 
-    @Inject private ServiceLocator habitat;
+    @Inject
+    private ServiceLocator habitat;
 
+    @Override
     public ClientRequestInterceptor createClientRequestInterceptor(ORBInitInfo info, Codec codec) {
         if (tci == null) {
             tci = new TransactionClientInterceptor("TransactionClientInterceptor", 1, habitat);
@@ -48,6 +49,7 @@ public ClientRequestInterceptor createClientRequestInterceptor(ORBInitInfo info,
         return tci;
     }
 
+    @Override
     public ServerRequestInterceptor createServerRequestInterceptor(ORBInitInfo info, Codec codec) {
         if (tsi == null) {
             tsi = new TransactionServerInterceptor(2, habitat);
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java
index e96ccff1aa2..085efa00ac5 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,18 +17,20 @@
 
 package com.sun.enterprise.transaction.jts.iiop;
 
-import org.omg.CORBA.LocalObject;
-import org.omg.PortableInterceptor.ServerRequestInterceptor;
-import org.omg.PortableInterceptor.ServerRequestInfo;
-
 import org.glassfish.enterprise.iiop.api.GlassFishORBHelper;
 import org.glassfish.hk2.api.ServiceLocator;
+import org.omg.CORBA.LocalObject;
+import org.omg.PortableInterceptor.ServerRequestInfo;
+import org.omg.PortableInterceptor.ServerRequestInterceptor;
 
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
 
-public class TransactionServerInterceptor extends LocalObject
-        implements ServerRequestInterceptor, Comparable {
+public class TransactionServerInterceptor extends LocalObject implements ServerRequestInterceptor, Comparable {
 
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
     private static final String name = "TransactionServerInterceptor";
     private int order;
 
@@ -36,6 +39,7 @@ public class TransactionServerInterceptor extends LocalObject
 
     /**
      * Construct the interceptor.
+     *
      * @param the order in which the interceptor should run.
      */
     public TransactionServerInterceptor(int order, ServiceLocator habitat) {
@@ -44,13 +48,16 @@ public TransactionServerInterceptor(int order, ServiceLocator habitat) {
         tm = habitat.getService(JavaEETransactionManager.class);
     }
 
+    @Override
     public String name() {
         return name;
     }
 
-    public void receive_request_service_contexts(ServerRequestInfo sri) { }
-
+    @Override
+    public void receive_request_service_contexts(ServerRequestInfo sri) {
+    }
 
+    @Override
     public int compareTo(Object o) {
         int otherOrder = -1;
         if (o instanceof TransactionServerInterceptor) {
@@ -64,29 +71,34 @@ public int compareTo(Object o) {
         return 1;
     }
 
-
+    @Override
     public void destroy() {
     }
 
+    @Override
     public void receive_request(ServerRequestInfo sri) {
     }
 
+    @Override
     public void send_reply(ServerRequestInfo sri) {
         checkTransaction(sri);
     }
 
+    @Override
     public void send_exception(ServerRequestInfo sri) {
         checkTransaction(sri);
     }
 
+    @Override
     public void send_other(ServerRequestInfo sri) {
         checkTransaction(sri);
     }
 
     private void checkTransaction(ServerRequestInfo sri) {
         try {
-            if (tm != null)
+            if (tm != null) {
                 tm.checkTransactionImport();
+            }
         } finally {
             if (gfORBHelper.isEjbCall(sri)) {
                 tm.cleanTxnTimeout();
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
index 556e44535df..87f11949f66 100755
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,33 +17,36 @@
 
 package com.sun.enterprise.transaction.jts.iiop;
 
-import java.util.logging.Logger;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
+import org.glassfish.enterprise.iiop.api.GlassFishORBHelper;
+import org.glassfish.hk2.api.ServiceLocator;
 import org.omg.CORBA.Any;
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.INV_POLICY;
 import org.omg.CORBA.INTERNAL;
+import org.omg.CORBA.INV_POLICY;
 import org.omg.CORBA.LocalObject;
+import org.omg.CORBA.ORB;
+import org.omg.CosTSInteroperation.TAG_INV_POLICY;
+import org.omg.CosTSInteroperation.TAG_OTS_POLICY;
 import org.omg.CosTransactions.ADAPTS;
-import org.omg.CosTransactions.SHARED;
 import org.omg.CosTransactions.OTSPolicy;
-import org.omg.CosTSInteroperation.TAG_OTS_POLICY;
-import org.omg.CosTSInteroperation.TAG_INV_POLICY;
+import org.omg.CosTransactions.SHARED;
 import org.omg.IOP.Codec;
 import org.omg.IOP.TaggedComponent;
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
 
 import com.sun.logging.LogDomains;
-import org.glassfish.enterprise.iiop.api.GlassFishORBHelper;
-import org.glassfish.hk2.api.ServiceLocator;
 
 public class TxIORInterceptor extends LocalObject implements IORInterceptor {
 
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
 
-    private static Logger _logger =
-           LogDomains.getLogger(com.sun.jts.pi.InterceptorImpl.class, LogDomains.TRANSACTION_LOGGER);
+    private static Logger _logger = LogDomains.getLogger(com.sun.jts.pi.InterceptorImpl.class, LogDomains.TRANSACTION_LOGGER);
 
     private Codec codec;
 
@@ -53,15 +57,18 @@ public TxIORInterceptor(Codec c, ServiceLocator h) {
         habitat = h;
     }
 
+    @Override
     public void destroy() {
     }
 
+    @Override
     public String name() {
         return "TxIORInterceptor";
     }
 
     // Note: this is called for all remote refs created from this ORB,
     // including EJBs and COSNaming objects.
+    @Override
     public void establish_components(IORInfo iorInfo) {
         try {
             _logger.log(Level.FINE, "TxIORInterceptor.establish_components->:");
@@ -69,16 +76,14 @@ public void establish_components(IORInfo iorInfo) {
             // Add OTS tagged components. These are always the same for all EJBs
             OTSPolicy otsPolicy = null;
             try {
-                otsPolicy = (OTSPolicy)iorInfo.get_effective_policy(
-             habitat.getService(GlassFishORBHelper.class).getOTSPolicyType());
-            } catch ( INV_POLICY ex ) {
-                _logger.log(Level.FINE,
-                        "TxIORInterceptor.establish_components: OTSPolicy not present");
+                otsPolicy = (OTSPolicy) iorInfo.get_effective_policy(habitat.getService(GlassFishORBHelper.class).getOTSPolicyType());
+            } catch (INV_POLICY ex) {
+                _logger.log(Level.FINE, "TxIORInterceptor.establish_components: OTSPolicy not present");
             }
-        addOTSComponents(iorInfo, otsPolicy);
+            addOTSComponents(iorInfo, otsPolicy);
 
         } catch (Exception e) {
-            _logger.log(Level.WARNING,"Exception in establish_components", e);
+            _logger.log(Level.WARNING, "Exception in establish_components", e);
         } finally {
             _logger.log(Level.FINE, "TxIORInterceptor.establish_components<-:");
         }
@@ -89,8 +94,8 @@ private void addOTSComponents(IORInfo iorInfo, OTSPolicy otsPolicy) {
         short otsPolicyValue = ADAPTS.value;
 
         if (otsPolicy != null) {
-        otsPolicyValue = otsPolicy.value();
-    }
+            otsPolicyValue = otsPolicy.value();
+        }
 
         Any otsAny = ORB.init().create_any();
         Any invAny = ORB.init().create_any();
@@ -104,15 +109,13 @@ private void addOTSComponents(IORInfo iorInfo, OTSPolicy otsPolicy) {
             otsCompValue = codec.encode_value(otsAny);
             invCompValue = codec.encode_value(invAny);
         } catch (org.omg.IOP.CodecPackage.InvalidTypeForEncoding e) {
-            throw new INTERNAL("InvalidTypeForEncoding "+e.getMessage());
+            throw new INTERNAL("InvalidTypeForEncoding " + e.getMessage());
         }
 
-        TaggedComponent otsComp = new TaggedComponent(TAG_OTS_POLICY.value,
-                                                      otsCompValue);
+        TaggedComponent otsComp = new TaggedComponent(TAG_OTS_POLICY.value, otsCompValue);
         iorInfo.add_ior_component(otsComp);
 
-        TaggedComponent invComp = new TaggedComponent(TAG_INV_POLICY.value,
-                                                      invCompValue);
+        TaggedComponent invComp = new TaggedComponent(TAG_INV_POLICY.value, invCompValue);
         iorInfo.add_ior_component(invComp);
     }
 
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java
index b1fbf52169f..243e5bee4dd 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -16,11 +17,14 @@
 
 package com.sun.enterprise.transaction.jts.recovery;
 
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
+
 import java.io.Serializable;
 import java.util.Map;
 import java.util.Properties;
 import java.util.logging.Logger;
-import java.util.logging.Level;
 
 import com.sun.jts.jta.TransactionServiceProperties;
 import com.sun.jts.CosTransactions.Configuration;
@@ -83,15 +87,15 @@ public GMSCallBack(int waitTime, ServiceLocator serviceLocator) {
                     }
 
                     gms = gmsAdapter.getModule();
+                    
                     // Set the member details when GMS service is ready to store it
                     String instanceName = props.getProperty(Configuration.INSTANCE_NAME);
                     String logdir = props.getProperty(Configuration.LOG_DIRECTORY);
                     try {
-                         _logger.log(Level.INFO, "Storing GMS instance " + instanceName +
-                                 " data " + TXLOGLOCATION + " : " + logdir);
-                         gms.updateMemberDetails(instanceName, TXLOGLOCATION, logdir);
+                        _logger.log(INFO, "Storing GMS instance " + instanceName + " data " + TXLOGLOCATION + " : " + logdir);
+                        gms.updateMemberDetails(instanceName, TXLOGLOCATION, logdir);
                     } catch (Exception e) {
-                        _logger.log(Level.WARNING, "jts.error_updating_gms", e);
+                        _logger.log(WARNING, "jts.error_updating_gms", e);
                     }
                 }
             }
@@ -104,16 +108,16 @@ public void processNotification(Signal signal) {
         if (signal instanceof FailureRecoverySignal) {
             long timestamp = System.currentTimeMillis();
 
-            if (_logger.isLoggable(Level.INFO)) {
-                _logger.log(Level.INFO, "[GMSCallBack] failure recovery signal: " + signal);
+            if (_logger.isLoggable(INFO)) {
+                _logger.log(INFO, "[GMSCallBack] failure recovery signal: " + signal);
             }
 
             // Waiting for 1 minute (or the user set value) to ensure that indoubt xids are updated into
             // the database, otherwise while doing the recovery an instance may not
             // get all the correct indoubt xids.
             try {
-                Thread.sleep(waitTime*1000L);
-            } catch(InterruptedException e) {
+                Thread.sleep(waitTime * 1000L);
+            } catch (InterruptedException e) {
                 e.printStackTrace();
             }
 
@@ -124,13 +128,12 @@ public void processNotification(Signal signal) {
             } else {
                 Map<Serializable, Serializable> failedMemberDetails = signal.getMemberDetails();
                 if (failedMemberDetails != null) {
-                    logdir = (String)failedMemberDetails.get(TXLOGLOCATION);
+                    logdir = (String) failedMemberDetails.get(TXLOGLOCATION);
                 }
             }
 
-            synchronized(lock) {
-                _logger.log(Level.INFO, "[GMSCallBack] Recovering for instance: " + instance +
-                        " logdir: " + logdir);
+            synchronized (lock) {
+                _logger.log(INFO, "[GMSCallBack] Recovering for instance: " + instance + " logdir: " + logdir);
                 doRecovery(logdir, instance, timestamp);
 
                 if (!Configuration.isDBLoggingEnabled()) {
@@ -139,39 +142,40 @@ public void processNotification(Signal signal) {
                         logdir = finishDelegatedRecovery(logdir, timestamp);
                     }
                 }
-                _logger.log(Level.INFO, "[GMSCallBack] Finished recovery for instance: " + instance);
+                _logger.log(INFO, "[GMSCallBack] Finished recovery for instance: " + instance);
             }
         } else {
-            if (_logger.isLoggable(Level.FINE)) {
-                _logger.log(Level.FINE, "[GMSCallBack] ignoring signal: " + signal);
+            if (_logger.isLoggable(FINE)) {
+                _logger.log(FINE, "[GMSCallBack] ignoring signal: " + signal);
             }
         }
     }
 
     /**
-     * Find records of not finished delegated recovery in the recovery lock file on
-     * this path, and do delegated recovery if such record exists
+     * Find records of not finished delegated recovery in the recovery lock file on this path, and do delegated recovery if
+     * such record exists
      */
     String finishDelegatedRecovery(String logdir) {
         return finishDelegatedRecovery(logdir, startTime);
     }
 
     /**
-     * Find records of not finished delegated recovery in the recovery lock file on
-     * this path and recorded before specified timestamp, and do delegated recovery if such record exists
+     * Find records of not finished delegated recovery in the recovery lock file on this path and recorded before specified
+     * timestamp, and do delegated recovery if such record exists
      */
     String finishDelegatedRecovery(String logdir, long timestamp) {
         String delegatedLogDir = null;
         String instance = fence.getInstanceRecoveredFor(logdir, timestamp);
-        if (_logger.isLoggable(Level.INFO)) {
-            _logger.log(Level.INFO, "[GMSCallBack] Instance " + instance + " need to finish delegated recovering");
+        if (_logger.isLoggable(INFO)) {
+            _logger.log(INFO, "[GMSCallBack] Instance " + instance + " need to finish delegated recovering");
         }
+        
         if (instance != null) {
-            DistributedStateCache dsc=gms.getGroupHandle().getDistributedStateCache();
-            Map<Serializable, Serializable> memberDetails = dsc.getFromCacheForPattern(MEMBER_DETAILS, instance );
-            delegatedLogDir = (String)memberDetails.get(TXLOGLOCATION);
-            if (_logger.isLoggable(Level.INFO)) {
-                _logger.log(Level.INFO, "[GMSCallBack] Tx log dir for instance " + instance + " is " + delegatedLogDir);
+            DistributedStateCache dsc = gms.getGroupHandle().getDistributedStateCache();
+            Map<Serializable, Serializable> memberDetails = dsc.getFromCacheForPattern(MEMBER_DETAILS, instance);
+            delegatedLogDir = (String) memberDetails.get(TXLOGLOCATION);
+            if (_logger.isLoggable(INFO)) {
+                _logger.log(INFO, "[GMSCallBack] Tx log dir for instance " + instance + " is " + delegatedLogDir);
             }
 
             doRecovery(delegatedLogDir, instance, timestamp);
@@ -189,13 +193,13 @@ private void doRecovery(String logdir, String instance, long timestamp) {
             if (logdir == null) {
                 // Could happen if instance fails BEFORE actually getting this info into distributed state cache.
                 // Could also be a gms distributed state cache bug.
-                _logger.log(Level.WARNING, "jts.error_getting_member_details", instance);
+                _logger.log(WARNING, "jts.error_getting_member_details", instance);
                 return;
             }
 
             if (fence.isFenceRaised(logdir, instance, timestamp)) {
-                if (_logger.isLoggable(Level.INFO)) {
-                    _logger.log(Level.INFO, "Instance " + instance + " is already recovering");
+                if (_logger.isLoggable(INFO)) {
+                    _logger.log(INFO, "Instance " + instance + " is already recovering");
                 }
                 return;
             }
@@ -206,18 +210,18 @@ private void doRecovery(String logdir, String instance, long timestamp) {
                 fence.raiseFence(logdir, instance);
             }
 
-            if (_logger.isLoggable(Level.FINE)) {
-                _logger.log(Level.FINE, "Transaction log directory for " + instance + " is " + logdir);
-                _logger.log(Level.FINE, "Starting transaction recovery of " + instance);
+            if (_logger.isLoggable(FINE)) {
+                _logger.log(FINE, "Transaction log directory for " + instance + " is " + logdir);
+                _logger.log(FINE, "Starting transaction recovery of " + instance);
             }
 
             ResourceRecoveryManager recoveryManager = serviceLocator.getService(ResourceRecoveryManager.class);
             recoveryManager.recoverIncompleteTx(true, logdir, instance, true);
-            if (_logger.isLoggable(Level.FINE)) {
-                _logger.log(Level.FINE, "Transaction recovery of " + instance + " is completed");
+            if (_logger.isLoggable(FINE)) {
+                _logger.log(FINE, "Transaction recovery of " + instance + " is completed");
             }
         } catch (Throwable e) {
-            _logger.log(Level.WARNING, "jts.recovery_error", e);
+            _logger.log(WARNING, "jts.recovery_error", e);
         } finally {
             if (!Configuration.isDBLoggingEnabled()) {
                 fence.lowerFence(logdir, instance);
@@ -226,14 +230,12 @@ private void doRecovery(String logdir, String instance, long timestamp) {
     }
 
     private boolean isInstanceRunning(String instance) {
-        boolean rs = false;
-        for(Server server : servers.getServer()) {
-            if(instance.equals(server.getName())) {
-                rs = server.isRunning();
-                break;
+        for (Server server : servers.getServer()) {
+            if (instance.equals(server.getName())) {
+                return server.isRunning();
             }
         }
 
-        return rs;
+        return false;
     }
 }
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java
index f4cfff2157d..aca400d5293 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -18,19 +19,28 @@
 
 package com.sun.enterprise.transaction.jts.recovery;
 
-import java.sql.*;
-import javax.transaction.xa.*;
+import static com.sun.logging.LogDomains.JTA_LOGGER;
+import static java.util.logging.Level.FINEST;
 
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
+import com.sun.enterprise.transaction.JavaEETransactionManagerSimplified;
 import com.sun.enterprise.transaction.api.XAResourceWrapper;
 import com.sun.enterprise.util.i18n.StringManager;
-import java.util.logging.Logger;
-import java.util.logging.Level;
 import com.sun.logging.LogDomains;
 
-
 /**
- * This implements workaround for Oracle XAResource. Oracle's 8.1.7 XAResource implementation
- * doesn't work fine while recovery. This class fires sql statements to achieve same.
+ * This implements workaround for Oracle XAResource. Oracle's 8.1.7 XAResource implementation doesn't work fine while
+ * recovery. This class fires sql statements to achieve same.
  *
  * @author <a href="mailto:bala.dutt@sun.com">Bala Dutt</a>
  * @version 1.0
@@ -42,95 +52,86 @@ public class OracleXAResource extends XAResourceWrapper {
 
     // Use JTA_LOGGER for backward compatibility, so use a class from
     // 'jta' bundle to load it.
-    private static final Logger _logger = LogDomains.getLogger(
-            com.sun.enterprise.transaction.JavaEETransactionManagerSimplified.class,
-            LogDomains.JTA_LOGGER);
+    private static final Logger _logger = LogDomains.getLogger(JavaEETransactionManagerSimplified.class, JTA_LOGGER);
 
+    @Override
     public XAResourceWrapper getInstance() {
         return new OracleXAResource();
     }
 
     /**
-     * Recovers list of xids in transaction table. Recover on oracle ignores flags sent to it, this method
-     * takes care of flags in addition to calling recoverList for xid list.
+     * Recovers list of xids in transaction table. Recover on oracle ignores flags sent to it, this method takes care of
+     * flags in addition to calling recoverList for xid list.
      *
      * @param flag an <code>int</code> value
      * @return a <code>Xid[]</code> value
      * @exception XAException if an error occurs
      */
+    @Override
     public Xid[] recover(int flag) throws XAException {
         if (flag == XAResource.TMNOFLAGS) {
             return null;
         }
+        
         return recoverList(flag);
     }
 
-
     /**
-     * Fires a select statement so that transaction xids are updated and retrieve the xid list.
-     * Oracle
-     * doesn't update the xid's for sometime. After this update, recover of real oracle xa resource
-     * is
-     * is used get xid list.
+     * Fires a select statement so that transaction xids are updated and retrieve the xid list. Oracle doesn't update the
+     * xid's for sometime. After this update, recover of real oracle xa resource is is used get xid list.
      *
      * @return a <code>Xid[]</code> value
      * @exception XAException if an error occurs
      */
-    private Xid [] recoverList(int flag) throws XAException{
-        Statement stmt = null;
+    private Xid[] recoverList(int flag) throws XAException {
+        Statement statement = null;
         ResultSet resultset = null;
-        Connection con = null;
-        try{
-            con=(Connection)m_xacon.getConnection(subject,null);
-            if(null == con)
+        Connection connection = null;
+        try {
+            connection = (Connection) m_xacon.getConnection(subject, null);
+            if (connection == null) {
                 // throw new XAException("Oracle XA Resource wrapper : connection could not be got");
                 throw new XAException(sm.getString("transaction.oracle_xa_wrapper_connection_failed"));
-            stmt = con.createStatement();
-            resultset = stmt.executeQuery(
-                "select pending.local_tran_id from SYS.PENDING_TRANS$ pending, SYS.DBA_2PC_NEIGHBORS");
+            }
+            statement = connection.createStatement();
+            resultset = statement.executeQuery("select pending.local_tran_id from SYS.PENDING_TRANS$ pending, SYS.DBA_2PC_NEIGHBORS");
             resultset.close();
             resultset = null;
-            stmt.close();
-            stmt=null;
+            statement.close();
+            statement = null;
             return m_xacon.getXAResource().recover(flag);
-        }
-        catch(SQLException sqlexception){
-            //Trace.info("Failed to recover xid list");
-            // throw new XAException("oracle XA Resource wrapper : "+sqlexception);
-            throw new XAException(sm.getString("transaction.oracle_sqlexception_occurred",sqlexception));
-        }
-        catch(XAException e){
+        } catch (SQLException sqlexception) {
+            throw new XAException(sm.getString("transaction.oracle_sqlexception_occurred", sqlexception));
+        } catch (XAException e) {
             throw e;
-        }
-        catch(Exception e){
-            throw new XAException(sm.getString("transaction.oracle_unknownexception_occurred",e));
-            // throw new XAException("oracle XA Resource wrapper : "+e);
-        }
-        finally{
-            if(null != resultset)
-                try{
+        } catch (Exception e) {
+            throw new XAException(sm.getString("transaction.oracle_unknownexception_occurred", e));
+        } finally {
+            if (resultset != null) {
+                try {
                     resultset.close();
+                } catch (SQLException sqlexception1) {
                 }
-                catch(SQLException sqlexception1) { }
-            if(null != stmt)
-                try{
-                    stmt.close();
+            }
+            if (statement != null) {
+                try {
+                    statement.close();
+                } catch (SQLException sqlexception2) {
                 }
-                catch(SQLException sqlexception2) { }
+            }
         }
     }
 
-
+    @Override
     public void commit(Xid xid, boolean flag) throws XAException {
         doRecovery(xid, true);
     }
 
-
+    @Override
     public void rollback(Xid xid) throws XAException {
         doRecovery(xid, false);
     }
 
-
     /**
      * Does actual recovery depending on boolean argument - true for commmit.
      *
@@ -138,73 +139,65 @@ public void rollback(Xid xid) throws XAException {
      * @param isCommit a <code>boolean</code> value
      * @exception XAException if an error occurs
      */
-    private void doRecovery(Xid xid, boolean isCommit) throws XAException{
-
+    private void doRecovery(Xid xid, boolean isCommit) throws XAException {
         try {
-            if (isCommit)
-                m_xacon.getXAResource().commit(xid,true);
-            else
+            if (isCommit) {
+                m_xacon.getXAResource().commit(xid, true);
+            } else {
                 m_xacon.getXAResource().rollback(xid);
+            }
         } catch (XAException ex) {
-            _logger.log(Level.FINEST," An XAException occurred while calling XAResource method " , ex);
+            _logger.log(FINEST, " An XAException occurred while calling XAResource method ", ex);
         } catch (Exception ex) {
-            _logger.log(Level.FINEST," An Exception occurred while calling XAResource method " , ex);
+            _logger.log(FINEST, " An Exception occurred while calling XAResource method ", ex);
         }
 
-        Statement stmt = null;
+        Statement statement = null;
         ResultSet resultset = null;
-        Connection con = null;
-        try{
-            con=(Connection)m_xacon.getConnection(subject,null);
-            if(null == con)
+        Connection connection = null;
+        try {
+            connection = (Connection) m_xacon.getConnection(subject, null);
+            if (connection == null) {
                 throw new XAException(sm.getString("transaction.oracle_xa_wrapper_connection_failed"));
-                // throw new XAException("Oracle XA Resource wrapper : connection could not be got");
-            stmt = con.createStatement();
-            resultset = stmt.executeQuery(
-                "select pending.local_tran_id from SYS.PENDING_TRANS$ pending, SYS.DBA_2PC_NEIGHBORS dba where pending.global_foreign_id = '"
-                + toHexString(xid.getGlobalTransactionId()) +
-                "' and pending.local_tran_id = dba.local_tran_id and dba.branch = '"
-                + toHexString(xid.getBranchQualifier()) +
-                "' and pending.state = 'prepared'");
-            if(resultset.next()){
+            }
+            
+            statement = connection.createStatement();
+            resultset = statement.executeQuery(
+                    "select pending.local_tran_id from SYS.PENDING_TRANS$ pending, SYS.DBA_2PC_NEIGHBORS dba where pending.global_foreign_id = '"
+                            + toHexString(xid.getGlobalTransactionId())
+                            + "' and pending.local_tran_id = dba.local_tran_id and dba.branch = '" + toHexString(xid.getBranchQualifier())
+                            + "' and pending.state = 'prepared'");
+            if (resultset.next()) {
                 String s = resultset.getString(1);
                 resultset.close();
                 resultset = null;
-                stmt.executeUpdate((isCommit ? "commit force '" : "rollback force '") + s + "'");
-                stmt.close();
-                stmt=null;
+                statement.executeUpdate((isCommit ? "commit force '" : "rollback force '") + s + "'");
+                statement.close();
+                statement = null;
             }
-        }
-        catch(SQLException sqlexception){
-            //Trace.info("Failed to recover " + xid+" "+ sqlexception);
-            _logger.log(Level.FINE," An SQLException during recovery " , sqlexception);
-            throw new XAException(sm.getString("transaction.oracle_sqlexception_occurred",sqlexception));
-            // throw new XAException("oracle XA Resource wrapper : "+sqlexception);
-        }
-        catch(Exception e){
-            //Trace.info("Exception while RecoveryTestRI recover "+e);
-            _logger.log(Level.FINE," An Exception during recovery " , e);
-            throw new XAException(sm.getString("transaction.oracle_unknownexception_occurred",e));
-            // throw new XAException("oracle XA Resource wrapper : "+e);
-        }
-        finally{
-            if(null != resultset)
-                try{
+        } catch (SQLException sqlexception) {
+            _logger.log(Level.FINE, " An SQLException during recovery ", sqlexception);
+            throw new XAException(sm.getString("transaction.oracle_sqlexception_occurred", sqlexception));
+        } catch (Exception e) {
+            _logger.log(Level.FINE, " An Exception during recovery ", e);
+            throw new XAException(sm.getString("transaction.oracle_unknownexception_occurred", e));
+        } finally {
+            if (resultset != null) {
+                try {
                     resultset.close();
+                } catch (SQLException sqlexception1) {
                 }
-                catch(SQLException sqlexception1) { }
-            if(null != stmt)
-                try{
-                    stmt.close();
+            }
+            if (statement != null) {
+                try {
+                    statement.close();
+                } catch (SQLException sqlexception2) {
                 }
-                catch(SQLException sqlexception2) { }
+            }
         }
     }
 
-    private static final char HEX_DIGITS[] = {
-        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-        'A', 'B', 'C', 'D', 'E', 'F'
-    };
+    private static final char HEX_DIGITS[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
 
     /**
      * Converts Xids into string that can be used in sql statements for oracle.
@@ -214,14 +207,14 @@ private void doRecovery(Xid xid, boolean isCommit) throws XAException{
      */
     private static String toHexString(byte abyte0[]) {
         StringBuffer stringbuffer = new StringBuffer();
-        if(null != abyte0 && 0 < abyte0.length) {
-            for(int i = 0; i < abyte0.length; i++) {
+        if (null != abyte0 && 0 < abyte0.length) {
+            for (int i = 0; i < abyte0.length; i++) {
                 stringbuffer.append(HEX_DIGITS[(abyte0[i] & 0xf0) >> 4]);
                 stringbuffer.append(HEX_DIGITS[abyte0[i] & 0xf]);
             }
             return stringbuffer.toString();
-        } else {
-            return "";
         }
+        
+        return "";
     }
 }
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java
index 1666ae7905f..75c05c7ed1d 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -24,36 +25,36 @@
 
 package com.sun.enterprise.transaction.jts.recovery;
 
-import java.util.*;
-import java.io.*;
-import java.nio.channels.FileLock;
+import static java.util.logging.Level.INFO;
+import static java.util.logging.Level.WARNING;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.RandomAccessFile;
+import java.nio.channels.FileLock;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Logger;
-import java.util.logging.Level;
-import com.sun.logging.LogDomains;
 
-import com.sun.enterprise.transaction.jts.api.TransactionRecoveryFence;
 import com.sun.enterprise.transaction.jts.api.DelegatedTransactionRecoveryFence;
-
+import com.sun.enterprise.transaction.jts.api.TransactionRecoveryFence;
 import com.sun.jts.CosTransactions.Configuration;
 import com.sun.jts.CosTransactions.LogControl;
 import com.sun.jts.CosTransactions.RecoveryManager;
+import com.sun.logging.LogDomains;
 
 /**
  * This class manages lock file required for delegated recovery.
+ *
  * @author mvatkina
  *
- * @see
- * Records in the recovery lock file have the following format:
- * PREFIX INSTANCE_NAME TIMESTAMP
- * Where PREFIX can be one of:
- * - "O" means OWNED by this instance, i.e. non-delegated recovery
- * - "B" means recovered BY the specified instance
- * - "F" means recovered FOR the specified instance
- * TIMESTAMP is the time of the recovery operation
+ * @see Records in the recovery lock file have the following format: PREFIX INSTANCE_NAME TIMESTAMP Where PREFIX can be
+ * one of: - "O" means OWNED by this instance, i.e. non-delegated recovery - "B" means recovered BY the specified
+ * instance - "F" means recovered FOR the specified instance TIMESTAMP is the time of the recovery operation
  *
-*/
-
+ */
 public class RecoveryLockFile implements TransactionRecoveryFence, DelegatedTransactionRecoveryFence {
 
     // Logger to log transaction messages = use class from com.sun.jts sub-package to find the bundle
@@ -82,6 +83,7 @@ public static DelegatedTransactionRecoveryFence getDelegatedTransactionRecoveryF
         return instance;
     }
 
+    @Override
     public void start() {
         if (!started) {
             gmsCallBack.finishDelegatedRecovery(log_path);
@@ -98,8 +100,8 @@ private void init(GMSCallBack gmsCallBack) {
         try {
             recoveryLockFile.createNewFile();
         } catch (Exception ex) {
-            _logger.log(Level.WARNING, "jts.exception_creating_recovery_file", recoveryLockFile);
-            _logger.log(Level.WARNING, "", ex);
+            _logger.log(WARNING, "jts.exception_creating_recovery_file", recoveryLockFile);
+            _logger.log(WARNING, "", ex);
         }
         RecoveryManager.registerTransactionRecoveryFence(this);
     }
@@ -107,9 +109,10 @@ private void init(GMSCallBack gmsCallBack) {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void raiseFence() {
         while (isRecovering()) {
-            //wait
+            // wait
             try {
                 Thread.sleep(60000);
             } catch (Exception e) {
@@ -121,15 +124,17 @@ public void raiseFence() {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void lowerFence() {
-        _logger.log(Level.INFO, "Lower Fence request for instance " + instance_name);
+        _logger.log(INFO, "Lower Fence request for instance " + instance_name);
         doneRecovering();
-        _logger.log(Level.INFO, "Fence lowered for instance " + instance_name);
+        _logger.log(INFO, "Fence lowered for instance " + instance_name);
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public boolean isFenceRaised(String logDir, String instance, long timestamp) {
         return isRecovering(logDir, instance, timestamp, BY);
     }
@@ -137,6 +142,7 @@ public boolean isFenceRaised(String logDir, String instance, long timestamp) {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void raiseFence(String logPath, String instance) {
         raiseFence(logPath, instance, 0L);
     }
@@ -145,30 +151,32 @@ public void raiseFence(String logPath, String instance) {
      * {@inheritDoc}
      */
     public void raiseFence(String logPath, String instance, long timestamp) {
-        _logger.log(Level.INFO, "Raise Fence request for instance " + instance);
+        _logger.log(INFO, "Raise Fence request for instance " + instance);
         while (isRecovering(logPath, instance, timestamp, BY)) {
-            //wait
+            // wait
             try {
                 Thread.sleep(60000);
             } catch (Exception e) {
             }
         }
         registerRecovery(logPath, instance);
-        _logger.log(Level.INFO, "Fence raised for instance " + instance);
+        _logger.log(INFO, "Fence raised for instance " + instance);
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public void lowerFence(String logPath, String instance) {
-        _logger.log(Level.INFO, "Lower Fence request for instance " + instance);
+        _logger.log(INFO, "Lower Fence request for instance " + instance);
         doneRecovering(logPath, instance);
-        _logger.log(Level.INFO, "Fence lowered for instance " + instance);
+        _logger.log(INFO, "Fence lowered for instance " + instance);
     }
 
     /**
      * {@inheritDoc}
      */
+    @Override
     public String getInstanceRecoveredFor(String path, long timestamp) {
         if (!isRecovering(path, null, timestamp, FOR)) {
             return doneRecovering(path, null, FOR);
@@ -180,6 +188,7 @@ public String getInstanceRecoveredFor(String path, long timestamp) {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void transferRecoveryTo(String logDir, String instance) {
         doneRecovering(logDir, null, BY);
         registerRecovery(logDir, instance);
@@ -193,33 +202,31 @@ private boolean isRecovering() {
     }
 
     /**
-     * Returns true if recovery file on the specified path contains information
-     * that the specified instance started recovery after specified timestamp
-     * either for itself or by another instance.
+     * Returns true if recovery file on the specified path contains information that the specified instance started recovery
+     * after specified timestamp either for itself or by another instance.
      */
     private boolean isRecovering(String logDir, String instance, long timestamp, String prefix) {
         BufferedReader reader = null;
         File recoveryLockFile = LogControl.recoveryLockFile(".", logDir);
         if (!recoveryLockFile.exists()) {
-            _logger.log(Level.INFO, "Lock File not found " + recoveryLockFile);
+            _logger.log(INFO, "Lock File not found " + recoveryLockFile);
             return false;
         }
 
         boolean result = false;
         try {
-            _logger.log(Level.INFO, "Checking Lock File " + recoveryLockFile);
+            _logger.log(INFO, "Checking Lock File " + recoveryLockFile);
             RandomAccessFile raf = new RandomAccessFile(recoveryLockFile, "rw");
             FileLock lock = raf.getChannel().lock();
             try {
                 reader = new BufferedReader(new FileReader(recoveryLockFile));
                 String line = null;
-                while( (line = reader.readLine()) != null) {
-                    _logger.log(Level.INFO, "Testing line: " + line);
+                while ((line = reader.readLine()) != null) {
+                    _logger.log(INFO, "Testing line: " + line);
                     String[] parts = line.split(SEPARATOR);
                     if (parts.length != 3) {
                         throw new IllegalStateException();
-                    } else if ((parts[0].equals(OWN) && parts[1].equals(instance)) ||
-                             (instance == null && parts[0].equals(prefix))) {
+                    } else if ((parts[0].equals(OWN) && parts[1].equals(instance)) || (instance == null && parts[0].equals(prefix))) {
                         result = (Long.parseLong(parts[2]) > timestamp);
                         break;
                     } else {
@@ -231,18 +238,18 @@ private boolean isRecovering(String logDir, String instance, long timestamp, Str
                 lock.release();
             }
         } catch (Exception ex) {
-            _logger.log(Level.WARNING, "jts.exception_in_recovery_file_handling", ex);
+            _logger.log(WARNING, "jts.exception_in_recovery_file_handling", ex);
         } finally {
             if (reader != null) {
                 try {
                     reader.close();
                 } catch (Exception ex) {
-                    _logger.log(Level.WARNING, "jts.exception_in_recovery_file_handling", ex);
+                    _logger.log(WARNING, "jts.exception_in_recovery_file_handling", ex);
                 }
             }
         }
 
-        _logger.log(Level.INFO, "Recovering? " + result);
+        _logger.log(INFO, "Recovering? " + result);
         return result;
     }
 
@@ -254,9 +261,8 @@ private void doneRecovering() {
     }
 
     /**
-     * Removes recovery data from the recovery lock files for both, the instance that the
-     * recovery is done for (i.e. for specified instance), and the current instance which the
-     * recovery is done by (in the lock file on the specified path)
+     * Removes recovery data from the recovery lock files for both, the instance that the recovery is done for (i.e. for
+     * specified instance), and the current instance which the recovery is done by (in the lock file on the specified path)
      */
     private void doneRecovering(String logPath, String instance) {
         doneRecovering(log_path, instance, FOR);
@@ -265,6 +271,7 @@ private void doneRecovering(String logPath, String instance) {
 
     /**
      * Removes recovery data from the recovery lock file.
+     *
      * @return instance name if instance was unknown (null).
      */
     private String doneRecovering(String logPath, String instance, String prefix) {
@@ -273,7 +280,7 @@ private String doneRecovering(String logPath, String instance, String prefix) {
         String result = null;
         File recoveryLockFile = LogControl.recoveryLockFile(".", logPath);
         if (!recoveryLockFile.exists()) {
-            _logger.log(Level.INFO, "Lock Fine not found: " + recoveryLockFile);
+            _logger.log(INFO, "Lock Fine not found: " + recoveryLockFile);
             return null;
         }
 
@@ -282,19 +289,19 @@ private String doneRecovering(String logPath, String instance, String prefix) {
             FileLock lock = raf.getChannel().lock();
             try {
                 reader = new BufferedReader(new FileReader(recoveryLockFile));
-                _logger.log(Level.INFO, "Updating File " + recoveryLockFile);
+                _logger.log(INFO, "Updating File " + recoveryLockFile);
                 String line = null;
-                List<String> list_out = new ArrayList<String>();
-                while( (line = reader.readLine()) != null) {
-                    _logger.log(Level.INFO, "Processing line: " + line);
+                List<String> list_out = new ArrayList<>();
+                while ((line = reader.readLine()) != null) {
+                    _logger.log(INFO, "Processing line: " + line);
                     String[] parts = line.split(SEPARATOR);
                     if (parts.length != 3) {
                         // Remove such line
-                        _logger.log(Level.INFO, "...skipping bad line ...");
+                        _logger.log(INFO, "...skipping bad line ...");
                         continue;
                     } else if (parts[0].equals(prefix) && (instance == null || parts[1].equals(instance))) {
                         // Remove such line
-                        _logger.log(Level.INFO, "...skipping found line ...");
+                        _logger.log(INFO, "...skipping found line ...");
                         result = parts[1];
                         continue;
                     }
@@ -307,7 +314,7 @@ private String doneRecovering(String logPath, String instance, String prefix) {
 
                 writer = new FileWriter(recoveryLockFile);
                 for (String out : list_out) {
-                    _logger.log(Level.INFO, "Re-adding line: " + out);
+                    _logger.log(INFO, "Re-adding line: " + out);
                     writer.write(out);
                     writer.write(END_LINE);
                 }
@@ -315,20 +322,20 @@ private String doneRecovering(String logPath, String instance, String prefix) {
                 lock.release();
             }
         } catch (Exception ex) {
-            _logger.log(Level.WARNING, "jts.exception_in_recovery_file_handling", ex);
+            _logger.log(WARNING, "jts.exception_in_recovery_file_handling", ex);
         } finally {
             if (reader != null) {
                 try {
                     reader.close();
                 } catch (Exception ex) {
-                    _logger.log(Level.WARNING, "jts.exception_in_recovery_file_handling", ex);
+                    _logger.log(WARNING, "jts.exception_in_recovery_file_handling", ex);
                 }
             }
             if (writer != null) {
                 try {
                     writer.close();
                 } catch (Exception ex) {
-                    _logger.log(Level.WARNING, "jts.exception_in_recovery_file_handling", ex);
+                    _logger.log(WARNING, "jts.exception_in_recovery_file_handling", ex);
                 }
             }
         }
@@ -348,8 +355,7 @@ private void registerRecovery() {
     }
 
     /**
-     * Writes into recovery lock file data about recovery for the specified instance by
-     * the current instance.
+     * Writes into recovery lock file data about recovery for the specified instance by the current instance.
      */
     private void registerRecovery(String logPath, String instance) {
         // Remove stale data if there is any
@@ -366,7 +372,7 @@ private void registerRecovery(String logPath, String instance, String prefix) {
         FileWriter writer = null;
         File recoveryLockFile = LogControl.recoveryLockFile(".", logPath);
         if (!recoveryLockFile.exists()) {
-            _logger.log(Level.INFO, "Lock File not found " + recoveryLockFile);
+            _logger.log(INFO, "Lock File not found " + recoveryLockFile);
             return;
         }
 
@@ -375,22 +381,24 @@ private void registerRecovery(String logPath, String instance, String prefix) {
             FileLock lock = raf.getChannel().lock();
             try {
                 writer = new FileWriter(recoveryLockFile, true);
-                    _logger.log(Level.INFO, "Writing into file " + recoveryLockFile);
-                StringBuffer b = (new StringBuffer()).append(prefix).append(SEPARATOR).append(instance).
-                        append(SEPARATOR).append(System.currentTimeMillis()).append(END_LINE);
-                _logger.log(Level.INFO, "Storing " + b);
+                _logger.log(INFO, "Writing into file " + recoveryLockFile);
+                StringBuffer b = (new StringBuffer())
+                        .append(prefix).append(SEPARATOR)
+                        .append(instance).append(SEPARATOR)
+                        .append(System.currentTimeMillis()).append(END_LINE);
+                _logger.log(INFO, "Storing " + b);
                 writer.write(b.toString());
             } finally {
                 lock.release();
             }
         } catch (Exception ex) {
-            _logger.log(Level.WARNING, "jts.exception_in_recovery_file_handling", ex);
+            _logger.log(WARNING, "jts.exception_in_recovery_file_handling", ex);
         } finally {
             if (writer != null) {
                 try {
                     writer.close();
                 } catch (Exception ex) {
-                    _logger.log(Level.WARNING, "jts.exception_in_recovery_file_handling", ex);
+                    _logger.log(WARNING, "jts.exception_in_recovery_file_handling", ex);
                 }
             }
         }
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java
index f0fc30ed618..0cb2b34988b 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java
@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2021 Contributors to the Eclipse Foundation
  * Copyright (c) 1997, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
@@ -18,65 +19,68 @@
 
 package com.sun.enterprise.transaction.jts.recovery;
 
-import javax.transaction.xa.*;
-import jakarta.resource.ResourceException;
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
 
 import com.sun.enterprise.transaction.api.XAResourceWrapper;
 import com.sun.enterprise.util.i18n.StringManager;
 
+import jakarta.resource.ResourceException;
+
 /**
  * XA Resource wrapper class for sybase XA Resource with jConnect 5.2.
  *
  * @author <a href="mailto:bala.dutt@sun.com">Bala Dutt</a>
  * @version 1.0
  */
-public class SybaseXAResource extends XAResourceWrapper
-{
-
+public class SybaseXAResource extends XAResourceWrapper {
 
     // Use superclass Sting Manager for Localization
     private static StringManager sm = StringManager.getManager(XAResourceWrapper.class);
 
+    @Override
     public XAResourceWrapper getInstance() {
         return new SybaseXAResource();
     }
 
-  /**
-   * Returns xids list for recovery depending on flags. Sybase XA Resource ignores the flags
-   * for XAResource recover call. This method takes care for the fault. Allows the recover call
-   * only for TMSTARTRSCAN, for other values of flags just returns null.
-   *
-   * @param flag an <code>int</code> value
-   * @return a <code>Xid[]</code> value
-   * @exception XAException if an error occurs
-   */
-  public Xid[] recover(int flag) throws XAException {
-        try{
-            if(flag==XAResource.TMSTARTRSCAN)
+    /**
+     * Returns xids list for recovery depending on flags. Sybase XA Resource ignores the flags for XAResource recover call.
+     * This method takes care for the fault. Allows the recover call only for TMSTARTRSCAN, for other values of flags just
+     * returns null.
+     *
+     * @param flag an <code>int</code> value
+     * @return a <code>Xid[]</code> value
+     * @exception XAException if an error occurs
+     */
+    @Override
+    public Xid[] recover(int flag) throws XAException {
+        try {
+            if (flag == XAResource.TMSTARTRSCAN) {
                 return m_xacon.getXAResource().recover(flag);
-        }catch(ResourceException e){
-            //a bad xa connection given...
-            // throw new XAException("sybase XA resource wrapper : Could not connect : sqlexception was "+e);
-            throw new XAException(sm.getString("transaction.sybase_xa_wrapper_connection_failed",e));
+            }
+        } catch (ResourceException e) {
+            throw new XAException(sm.getString("transaction.sybase_xa_wrapper_connection_failed", e));
         }
+        
         return null;
     }
-    public void commit(Xid xid, boolean flag) throws XAException{
-        try{
+
+    @Override
+    public void commit(Xid xid, boolean flag) throws XAException {
+        try {
             m_xacon.getXAResource().commit(xid, flag);
-        }catch(ResourceException e){
-            //a bad xa connection given...
-            throw new XAException(sm.getString("transaction.sybase_xa_wrapper_connection_failed",e));
-            // throw new XAException("sybase XA resource wrapper :Could not connect : sqlexception was "+e);
+        } catch (ResourceException e) {
+            throw new XAException(sm.getString("transaction.sybase_xa_wrapper_connection_failed", e));
         }
     }
-    public void rollback(Xid xid) throws XAException{
-        try{
+
+    @Override
+    public void rollback(Xid xid) throws XAException {
+        try {
             m_xacon.getXAResource().rollback(xid);
-        }catch(ResourceException e){
-            //a bad xa connection given...
-            throw new XAException(sm.getString("transaction.sybase_xa_wrapper_connection_failed",e));
-            // throw new XAException("sybase XA resource wrapper :Could not connect : sqlexception was "+e);
+        } catch (ResourceException e) {
+            throw new XAException(sm.getString("transaction.sybase_xa_wrapper_connection_failed", e));
         }
     }
 }

From 2bf86424a67934f21b8de0e4469033435bbaf43f Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Mon, 22 Nov 2021 13:37:46 +0100
Subject: [PATCH 2/3] Processing feedback and some extras

Signed-off-by: arjantijms <arjan.tijms@gmail.com>
---
 .../iiop/TransactionServerInterceptor.java    | 21 ++++++++----------
 .../transaction/jts/recovery/GMSCallBack.java | 22 ++++++++-----------
 .../jts/recovery/OracleXAResource.java        |  6 ++---
 .../jts/recovery/RecoveryLockFile.java        | 21 ++++++++++++++----
 .../jts/recovery/SybaseXAResource.java        |  2 +-
 5 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java
index 085efa00ac5..df738fab8ff 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionServerInterceptor.java
@@ -25,27 +25,24 @@
 
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
 
-public class TransactionServerInterceptor extends LocalObject implements ServerRequestInterceptor, Comparable {
+public class TransactionServerInterceptor extends LocalObject implements ServerRequestInterceptor, Comparable<Object> {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
     private static final String name = "TransactionServerInterceptor";
     private int order;
 
-    private JavaEETransactionManager tm;
-    private GlassFishORBHelper gfORBHelper = null;
+    private JavaEETransactionManager javaEETransactionManager;
+    private GlassFishORBHelper gfORBHelper;
 
     /**
      * Construct the interceptor.
      *
      * @param the order in which the interceptor should run.
      */
-    public TransactionServerInterceptor(int order, ServiceLocator habitat) {
+    public TransactionServerInterceptor(int order, ServiceLocator serviceLocator) {
         this.order = order;
-        gfORBHelper = habitat.getService(GlassFishORBHelper.class);
-        tm = habitat.getService(JavaEETransactionManager.class);
+        gfORBHelper = serviceLocator.getService(GlassFishORBHelper.class);
+        javaEETransactionManager = serviceLocator.getService(JavaEETransactionManager.class);
     }
 
     @Override
@@ -96,12 +93,12 @@ public void send_other(ServerRequestInfo sri) {
 
     private void checkTransaction(ServerRequestInfo sri) {
         try {
-            if (tm != null) {
-                tm.checkTransactionImport();
+            if (javaEETransactionManager != null) {
+                javaEETransactionManager.checkTransactionImport();
             }
         } finally {
             if (gfORBHelper.isEjbCall(sri)) {
-                tm.cleanTxnTimeout();
+                javaEETransactionManager.cleanTxnTimeout();
             }
         }
     }
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java
index 243e5bee4dd..8e30fee9eaa 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/GMSCallBack.java
@@ -26,25 +26,21 @@
 import java.util.Properties;
 import java.util.logging.Logger;
 
-import com.sun.jts.jta.TransactionServiceProperties;
-import com.sun.jts.CosTransactions.Configuration;
-
-import com.sun.enterprise.config.serverbeans.Server;
-import com.sun.enterprise.config.serverbeans.Servers;
-
-import com.sun.enterprise.transaction.api.ResourceRecoveryManager;
-import com.sun.enterprise.transaction.jts.api.DelegatedTransactionRecoveryFence;
-
 import org.glassfish.gms.bootstrap.GMSAdapter;
 import org.glassfish.gms.bootstrap.GMSAdapterService;
 import org.glassfish.hk2.api.ServiceLocator;
 
+import com.sun.enterprise.config.serverbeans.Server;
+import com.sun.enterprise.config.serverbeans.Servers;
 import com.sun.enterprise.ee.cms.core.CallBack;
 import com.sun.enterprise.ee.cms.core.DistributedStateCache;
-import com.sun.enterprise.ee.cms.core.GroupManagementService;
 import com.sun.enterprise.ee.cms.core.FailureRecoverySignal;
+import com.sun.enterprise.ee.cms.core.GroupManagementService;
 import com.sun.enterprise.ee.cms.core.Signal;
-
+import com.sun.enterprise.transaction.api.ResourceRecoveryManager;
+import com.sun.enterprise.transaction.jts.api.DelegatedTransactionRecoveryFence;
+import com.sun.jts.CosTransactions.Configuration;
+import com.sun.jts.jta.TransactionServiceProperties;
 import com.sun.logging.LogDomains;
 
 public class GMSCallBack implements CallBack {
@@ -87,7 +83,7 @@ public GMSCallBack(int waitTime, ServiceLocator serviceLocator) {
                     }
 
                     gms = gmsAdapter.getModule();
-                    
+
                     // Set the member details when GMS service is ready to store it
                     String instanceName = props.getProperty(Configuration.INSTANCE_NAME);
                     String logdir = props.getProperty(Configuration.LOG_DIRECTORY);
@@ -169,7 +165,7 @@ String finishDelegatedRecovery(String logdir, long timestamp) {
         if (_logger.isLoggable(INFO)) {
             _logger.log(INFO, "[GMSCallBack] Instance " + instance + " need to finish delegated recovering");
         }
-        
+
         if (instance != null) {
             DistributedStateCache dsc = gms.getGroupHandle().getDistributedStateCache();
             Map<Serializable, Serializable> memberDetails = dsc.getFromCacheForPattern(MEMBER_DETAILS, instance);
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java
index aca400d5293..5ac544864cc 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/OracleXAResource.java
@@ -72,7 +72,7 @@ public Xid[] recover(int flag) throws XAException {
         if (flag == XAResource.TMNOFLAGS) {
             return null;
         }
-        
+
         return recoverList(flag);
     }
 
@@ -160,7 +160,7 @@ private void doRecovery(Xid xid, boolean isCommit) throws XAException {
             if (connection == null) {
                 throw new XAException(sm.getString("transaction.oracle_xa_wrapper_connection_failed"));
             }
-            
+
             statement = connection.createStatement();
             resultset = statement.executeQuery(
                     "select pending.local_tran_id from SYS.PENDING_TRANS$ pending, SYS.DBA_2PC_NEIGHBORS dba where pending.global_foreign_id = '"
@@ -214,7 +214,7 @@ private static String toHexString(byte abyte0[]) {
             }
             return stringbuffer.toString();
         }
-        
+
         return "";
     }
 }
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java
index 75c05c7ed1d..66bf40e2add 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/RecoveryLockFile.java
@@ -48,11 +48,24 @@
 /**
  * This class manages lock file required for delegated recovery.
  *
- * @author mvatkina
+ * <p>
+ * Records in the recovery lock file have the following format:
+ *
+ * <p>
+ * <code>PREFIX INSTANCE_NAME TIMESTAMP</code>
+ *
+ * <p>
+ * Where <code>PREFIX</code> can be one of:
+ * <ul>
+ *  <li> "O" means OWNED by this instance, i.e. non-delegated recovery
+ *  <li> "B" means recovered BY the specified instance
+ *  <li> "F" means recovered FOR the specified instance
+ * </ul>
  *
- * @see Records in the recovery lock file have the following format: PREFIX INSTANCE_NAME TIMESTAMP Where PREFIX can be
- * one of: - "O" means OWNED by this instance, i.e. non-delegated recovery - "B" means recovered BY the specified
- * instance - "F" means recovered FOR the specified instance TIMESTAMP is the time of the recovery operation
+ * <p>
+ * <code>TIMESTAMP</code> is the time of the recovery operation
+ *
+ * @author mvatkina
  *
  */
 public class RecoveryLockFile implements TransactionRecoveryFence, DelegatedTransactionRecoveryFence {
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java
index 0cb2b34988b..ef7ade7b2c7 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/recovery/SybaseXAResource.java
@@ -62,7 +62,7 @@ public Xid[] recover(int flag) throws XAException {
         } catch (ResourceException e) {
             throw new XAException(sm.getString("transaction.sybase_xa_wrapper_connection_failed", e));
         }
-        
+
         return null;
     }
 

From ad1db3c109ac65fddd3eef45adf86493d877197d Mon Sep 17 00:00:00 2001
From: arjantijms <arjan.tijms@gmail.com>
Date: Mon, 22 Nov 2021 13:57:07 +0100
Subject: [PATCH 3/3] Continued removing unnecessary comments

Signed-off-by: arjantijms <arjan.tijms@gmail.com>
---
 .../iiop/TransactionClientInterceptor.java    | 13 +++---
 .../jts/iiop/TxIORInterceptor.java            | 41 +++++++++----------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
index a0bf653d09c..24b14b59b6b 100644
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TransactionClientInterceptor.java
@@ -17,24 +17,21 @@
 
 package com.sun.enterprise.transaction.jts.iiop;
 
+import static com.sun.corba.ee.spi.presentation.rmi.StubAdapter.isLocal;
+
 import org.glassfish.hk2.api.ServiceLocator;
 import org.omg.CORBA.LocalObject;
 import org.omg.PortableInterceptor.ClientRequestInfo;
 import org.omg.PortableInterceptor.ClientRequestInterceptor;
 
-import com.sun.corba.ee.spi.presentation.rmi.StubAdapter;
 import com.sun.enterprise.transaction.api.JavaEETransactionManager;
 
-public class TransactionClientInterceptor extends LocalObject
-        implements ClientRequestInterceptor, Comparable<TransactionClientInterceptor> {
+public class TransactionClientInterceptor extends LocalObject implements ClientRequestInterceptor, Comparable<TransactionClientInterceptor> {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
+
     private String name;
     private int order;
-
     private JavaEETransactionManager eeTransactionManager;
 
     /**
@@ -79,7 +76,7 @@ public void send_request(ClientRequestInfo clientRequestInfo) {
         // Check if there is an exportable transaction on current thread
         Object target = clientRequestInfo.effective_target();
         if (eeTransactionManager != null) {
-            eeTransactionManager.checkTransactionExport(StubAdapter.isLocal(target));
+            eeTransactionManager.checkTransactionExport(isLocal(target));
         }
     }
 
diff --git a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
index 87f11949f66..c7b368b7819 100755
--- a/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
+++ b/appserver/transaction/jts/src/main/java/com/sun/enterprise/transaction/jts/iiop/TxIORInterceptor.java
@@ -17,7 +17,9 @@
 
 package com.sun.enterprise.transaction.jts.iiop;
 
-import java.util.logging.Level;
+import static java.util.logging.Level.FINE;
+import static java.util.logging.Level.WARNING;
+
 import java.util.logging.Logger;
 
 import org.glassfish.enterprise.iiop.api.GlassFishORBHelper;
@@ -37,28 +39,21 @@
 import org.omg.PortableInterceptor.IORInfo;
 import org.omg.PortableInterceptor.IORInterceptor;
 
+import com.sun.jts.pi.InterceptorImpl;
 import com.sun.logging.LogDomains;
 
 public class TxIORInterceptor extends LocalObject implements IORInterceptor {
 
-    /**
-     *
-     */
     private static final long serialVersionUID = 1L;
 
-    private static Logger _logger = LogDomains.getLogger(com.sun.jts.pi.InterceptorImpl.class, LogDomains.TRANSACTION_LOGGER);
+    private static Logger _logger = LogDomains.getLogger(InterceptorImpl.class, LogDomains.TRANSACTION_LOGGER);
 
     private Codec codec;
+    private ServiceLocator serviceLocator;
 
-    private ServiceLocator habitat;
-
-    public TxIORInterceptor(Codec c, ServiceLocator h) {
-        codec = c;
-        habitat = h;
-    }
-
-    @Override
-    public void destroy() {
+    public TxIORInterceptor(Codec codec, ServiceLocator serviceLocator) {
+        this.codec = codec;
+        this.serviceLocator = serviceLocator;
     }
 
     @Override
@@ -71,24 +66,28 @@ public String name() {
     @Override
     public void establish_components(IORInfo iorInfo) {
         try {
-            _logger.log(Level.FINE, "TxIORInterceptor.establish_components->:");
+            _logger.log(FINE, "TxIORInterceptor.establish_components->:");
 
             // Add OTS tagged components. These are always the same for all EJBs
             OTSPolicy otsPolicy = null;
             try {
-                otsPolicy = (OTSPolicy) iorInfo.get_effective_policy(habitat.getService(GlassFishORBHelper.class).getOTSPolicyType());
+                otsPolicy = (OTSPolicy) iorInfo.get_effective_policy(serviceLocator.getService(GlassFishORBHelper.class).getOTSPolicyType());
             } catch (INV_POLICY ex) {
-                _logger.log(Level.FINE, "TxIORInterceptor.establish_components: OTSPolicy not present");
+                _logger.log(FINE, "TxIORInterceptor.establish_components: OTSPolicy not present");
             }
             addOTSComponents(iorInfo, otsPolicy);
 
         } catch (Exception e) {
-            _logger.log(Level.WARNING, "Exception in establish_components", e);
+            _logger.log(WARNING, "Exception in establish_components", e);
         } finally {
-            _logger.log(Level.FINE, "TxIORInterceptor.establish_components<-:");
+            _logger.log(FINE, "TxIORInterceptor.establish_components<-:");
         }
     }
 
+    @Override
+    public void destroy() {
+    }
+
     private void addOTSComponents(IORInfo iorInfo, OTSPolicy otsPolicy) {
         short invPolicyValue = SHARED.value;
         short otsPolicyValue = ADAPTS.value;
@@ -119,6 +118,4 @@ private void addOTSComponents(IORInfo iorInfo, OTSPolicy otsPolicy) {
         iorInfo.add_ior_component(invComp);
     }
 
-}
-
-// End of file.
+}
\ No newline at end of file