worked on code review coments

jbosstm · Apr 17, 2020 · f127c53 · f127c53
1 parent 824af49
commit f127c53
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 39 deletions.
diff --git a/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java b/ArjunaJTA/jta/classes/com/arjuna/ats/internal/jta/recovery/arjunacore/XARecoveryModule.java
@@ -78,14 +78,14 @@
 
 public class XARecoveryModule implements ExtendedRecoveryModule
 {
-	private static AtomicBoolean recoveryProblems = new AtomicBoolean(false);
+	private AtomicBoolean recoveryProblems = new AtomicBoolean(false);
 
-	public static boolean isRecoveryProblems() {
-		return recoveryProblems.get();
+	boolean isRecoveryProblems() {
+		return this.recoveryProblems.get();
 	}
 
-	public static void setRecoveryProblems(final boolean recoveryProblems) {
-		XARecoveryModule.recoveryProblems.set(recoveryProblems);
+	void setRecoveryProblems(final boolean recoveryProblems) {
+		this.recoveryProblems.set(recoveryProblems);
 	}
 
 	public XARecoveryModule()
@@ -102,7 +102,7 @@ public Set<String> getContactedJndiNames() {
 
     @Override
     public boolean isPeriodicWorkSuccessful() {
-        return !XARecoveryModule.isRecoveryProblems();
+        return !this.isRecoveryProblems();
     }
 
     public void addXAResourceRecoveryHelper(XAResourceRecoveryHelper xaResourceRecoveryHelper) {
@@ -200,7 +200,7 @@ private synchronized void periodicWorkFirstPass(ScanStates endState)
         }
 
         contactedJndiNames.clear();
-		XARecoveryModule.setRecoveryProblems(false);
+		this.setRecoveryProblems(false);
 
 		_uids = new InputObjectState();
 
@@ -212,18 +212,18 @@ private synchronized void periodicWorkFirstPass(ScanStates endState)
 		{
 			if (!_recoveryStore.allObjUids(_recoveryManagerClass.type(), _uids))
 			{
-				XARecoveryModule.setRecoveryProblems(true);
+				this.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_alluids();
 			}
 		}
 		catch (ObjectStoreException e)
 		{
-			XARecoveryModule.setRecoveryProblems(true);
+			this.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_objstoreerror(e);
 		}
 		catch (Exception e)
 		{
-			XARecoveryModule.setRecoveryProblems(true);
+			this.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_periodicfirstpass(_logName+".periodicWorkFirstPass", e);
 		}
 		// JBTM-1354 JCA needs to be able to recover XAResources associated with a subordinate transaction so we have to do at least
@@ -239,7 +239,7 @@ private synchronized void periodicWorkFirstPass(ScanStates endState)
 			try {
 				xaRecoveryFirstPass(xaResource);
 			} catch (Exception ex) {
-				XARecoveryModule.setRecoveryProblems(true);
+				this.setRecoveryProblems(true);
 				jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
 			}
 		}
@@ -249,7 +249,7 @@ private synchronized void periodicWorkFirstPass(ScanStates endState)
 				try {
 					xaResource.recover(XAResource.TMENDRSCAN);
 				} catch (Exception ex) {
-					XARecoveryModule.setRecoveryProblems(true);
+					this.setRecoveryProblems(true);
 					jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
 				}
 			}
@@ -292,7 +292,7 @@ public synchronized void periodicWorkSecondPass()
 		}
 		catch (Exception e)
 		{
-			XARecoveryModule.setRecoveryProblems(true);
+			this.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_periodicsecondpass(_logName+".periodicWorkSecondPass", e);
 		}
 
@@ -390,7 +390,7 @@ protected XARecoveryModule(XARecoveryResourceManager recoveryClass, String logNa
         _logName = logName;
         _recoveryManagerClass = recoveryClass;
         if(_recoveryManagerClass == null) {
-			XARecoveryModule.setRecoveryProblems(true);
+			this.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_constfail();
         }
 
@@ -450,7 +450,7 @@ record = _recoveryManagerClass.getResource(theUid);
 									}
 									else
 									{
-										XARecoveryModule.setRecoveryProblems(true);
+										this.setRecoveryProblems(true);
                                         jtaLogger.i18NLogger.warn_recovery_recoveryfailed(theUid, XARecoveryResourceHelper.stringForm(recoveryStatus));
 									}
 								}
@@ -488,7 +488,7 @@ record = _recoveryManagerClass.getResource(theUid);
 						{
 							problem = true;
 
-							XARecoveryModule.setRecoveryProblems(true);
+							this.setRecoveryProblems(true);
                             jtaLogger.i18NLogger.warn_recovery_recoveryerror(e);
 						}
 
@@ -505,7 +505,7 @@ record = _recoveryManagerClass.getResource(theUid);
 
 							if (record.getXid() == null)
 							{
-								XARecoveryModule.setRecoveryProblems(true);
+								this.setRecoveryProblems(true);
                                 jtaLogger.i18NLogger.warn_recovery_cannotadd();
 							}
 							else
@@ -522,7 +522,7 @@ record = _recoveryManagerClass.getResource(theUid);
 			}
 			catch (Throwable e)
 			{
-				XARecoveryModule.setRecoveryProblems(true);
+				this.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_unexpectedrecoveryerror(e);
 			}
 		}
@@ -540,7 +540,7 @@ private void bottomUpRecovery() {
 				try {
 					xaRecoverySecondPass(xaResource);
 				} catch (Exception ex) {
-					XARecoveryModule.setRecoveryProblems(true);
+					this.setRecoveryProblems(true);
 					jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
 				}
 			}
@@ -605,7 +605,7 @@ private final List<XAResource> resourceInitiatedRecovery()
 				}
 				catch (Exception ex)
 				{
-					XARecoveryModule.setRecoveryProblems(true);
+					this.setRecoveryProblems(true);
                     jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
 				}
 			}
@@ -636,7 +636,7 @@ private List<XAResource> resourceInitiatedRecoveryForRecoveryHelpers()
             }
             catch (Exception ex)
             {
-				XARecoveryModule.setRecoveryProblems(true);
+				this.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_getxaresource(ex);
             }
         }
@@ -692,7 +692,7 @@ private final void xaRecoveryFirstPass(XAResource xares)
 			}
 			catch (XAException e)
 			{
-				XARecoveryModule.setRecoveryProblems(true);
+				this.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_xarecovery1(_logName+".xaRecovery", XAHelper.printXAErrorCode(e), e);
 
 				try
@@ -827,7 +827,7 @@ private void xaRecoverySecondPass(XAResource xares) {
 
 								if (recoveryStatus != XARecoveryResource.RECOVERED_OK)
 								{
-									XARecoveryModule.setRecoveryProblems(true);
+									this.setRecoveryProblems(true);
 	                                jtaLogger.i18NLogger.warn_recovery_failedtorecover(_logName+".xaRecovery", XARecoveryResourceHelper.stringForm(recoveryStatus));
 								}
 
@@ -842,7 +842,7 @@ private void xaRecoverySecondPass(XAResource xares) {
 								}
 								catch (Exception e)
 								{
-									XARecoveryModule.setRecoveryProblems(true);
+									this.setRecoveryProblems(true);
 	                                jtaLogger.i18NLogger.warn_recovery_forgetfailed(_logName+".xaRecovery", e);
 								}
 							}
@@ -853,7 +853,7 @@ private void xaRecoverySecondPass(XAResource xares) {
 			}
 			catch (Exception e)
 			{
-				XARecoveryModule.setRecoveryProblems(true);
+				this.setRecoveryProblems(true);
 	            jtaLogger.i18NLogger.warn_recovery_generalrecoveryerror(_logName + ".xaRecovery", e);
 			}
 
@@ -864,7 +864,7 @@ private void xaRecoverySecondPass(XAResource xares) {
 			}
 			catch (XAException e)
 			{
-				XARecoveryModule.setRecoveryProblems(true);
+				this.setRecoveryProblems(true);
 	            jtaLogger.i18NLogger.warn_recovery_xarecovery1(_logName+".xaRecovery", XAHelper.printXAErrorCode(e), e);
 			}
 		}
@@ -921,7 +921,7 @@ else if(vote == XAResourceOrphanFilter.Vote.ROLLBACK)
             }
             else
             {
-				XARecoveryModule.setRecoveryProblems(true);
+				this.setRecoveryProblems(true);
                 jtaLogger.i18NLogger.warn_recovery_xarecovery1(_logName+".xaRecovery", XAHelper.printXAErrorCode(e1), e1);
             }
 
@@ -943,7 +943,7 @@ else if(vote == XAResourceOrphanFilter.Vote.ROLLBACK)
         }
         catch (Exception e2)
         {
-			XARecoveryModule.setRecoveryProblems(true);
+			this.setRecoveryProblems(true);
             jtaLogger.i18NLogger.warn_recovery_xarecovery2(_logName+".xaRecovery", e2);
         }
         return false;

diff --git a/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java b/ArjunaJTA/jta/classes/com/arjuna/ats/jta/logging/jtaI18NLogger.java
@@ -45,9 +45,6 @@
 /**
  * i18n log messages for the jta module.
  *
- * For jtaI18NLogger, if any method, prefixed with <b>"warn_recovery"</b> is called then,
- * <b>XARecoveryModule</b> class variable i.e. "recoveryProblem" should be set as <b>true</b>.
- *
  * @author Jonathan Halliday (jonathan.halliday@redhat.com) 2010-06
  */
 @MessageLogger(projectCode = "ARJUNA")

diff --git a/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryMonitorTest.java b/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryMonitorTest.java
@@ -65,8 +65,8 @@ public void testRecoveryMonitorWithFailure() throws Exception {
         recoveryEnvironmentBean.setRecoveryListener(true); // configure the RecoveryMonitor
 
         RecoveryManager manager = RecoveryManager.manager(RecoveryManager.DIRECT_MANAGEMENT);
-
-        manager.addModule(new XARecoveryModule()); // we only need to test the XARecoveryModule
+        XARecoveryModule xaRecoveryModule = new XARecoveryModule();
+        manager.addModule(xaRecoveryModule); // we only need to test the XARecoveryModule
 
         try {
             manager.startRecoveryManagerThread(); // start periodic recovery
@@ -80,7 +80,7 @@ public void testRecoveryMonitorWithFailure() throws Exception {
             // check the output of the scan
             assertEquals("ERROR", RecoveryMonitor.getResponse());
             assertEquals("ERROR", RecoveryMonitor.getSystemOutput());
-            assertTrue(XARecoveryModule.isRecoveryProblems());
+            assertTrue(!xaRecoveryModule.isPeriodicWorkSuccessful());
         } finally {
             manager.terminate();
         }

diff --git a/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryMonitorTest2.java b/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryMonitorTest2.java
@@ -108,7 +108,8 @@ public void start(Xid xid, int i) throws XAException {
 
         RecoveryManager manager = RecoveryManager.manager(RecoveryManager.DIRECT_MANAGEMENT);
 
-        manager.addModule(new XARecoveryModule()); // we only need to test the XARecoveryModule
+        XARecoveryModule xaRecoveryModule = new XARecoveryModule();
+        manager.addModule(xaRecoveryModule); // we only need to test the XARecoveryModule
 
         try {
             manager.startRecoveryManagerThread(); // start periodic recovery
@@ -122,7 +123,7 @@ public void start(Xid xid, int i) throws XAException {
             // check the output of the scan
             assertEquals("DONE", RecoveryMonitor.getResponse());
             assertEquals("DONE", RecoveryMonitor.getSystemOutput());
-            assertFalse(XARecoveryModule.isRecoveryProblems());
+            assertFalse(!xaRecoveryModule.isPeriodicWorkSuccessful());
         } finally {
             manager.terminate();
         }

diff --git a/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryScanTest.java b/ArjunaJTA/jta/tests/classes/com/hp/mwtests/ts/jta/recovery/RecoveryScanTest.java
@@ -49,6 +49,7 @@
 public class RecoveryScanTest {
 
     private static RecoveryManager manager;
+    private static XARecoveryModule xaRecoveryModule;
 
     @BeforeClass
     public static void beforeClass() throws Exception {
@@ -65,7 +66,8 @@ public static void beforeClass() throws Exception {
 
         manager = RecoveryManager.manager(RecoveryManager.DIRECT_MANAGEMENT);
 
-        manager.addModule(new XARecoveryModule()); // we only need to test the XARecoveryModule
+        xaRecoveryModule = new XARecoveryModule();
+        manager.addModule(xaRecoveryModule); // we only need to test the XARecoveryModule
         manager.startRecoveryManagerThread(); // start periodic recovery
     }
 
@@ -91,7 +93,7 @@ public void testRecoveryMonitorWithFailure() throws Exception {
 
         manager.scan();
 
-        assertTrue(XARecoveryModule.isRecoveryProblems());
+        assertTrue(!xaRecoveryModule.isPeriodicWorkSuccessful());
     }
 
     @Test
@@ -156,7 +158,7 @@ public void start(Xid xid, int i) throws XAException {
 
         manager.scan();
 
-        assertFalse(XARecoveryModule.isRecoveryProblems());
+        assertFalse(!xaRecoveryModule.isPeriodicWorkSuccessful());
     }
 
     @Test