[jboss-svn-commits] JBL Code SVN: r27951 - labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2009-07-13 08:04:21 -0400 (Mon, 13 Jul 2009)
New Revision: 27951

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java
Log:
Improvements to RecoveryManager test mode socket handling. JBTM-390


Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java	2009-07-13 11:45:30 UTC (rev 27950)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoveryManager.java	2009-07-13 12:04:21 UTC (rev 27951)
@@ -503,14 +503,14 @@
             {
                 manager = manager();
             }
-            catch(FatalError e)
+            catch(java.lang.Error e)
             {
                 if(testMode)
                 {
                     // in some test cases the recovery manager is killed and restarted in quick succession.
                     // sometimes the O/S does not free up the port fast enough, so we can't reclaim it on restart.
                     // For test mode only, we therefore have a simple backoff-retry kludge:
-                    System.err.println("Warning: got Fatal error '"+e.toString()+"' on startup, will retry in 5 seconds in the hope it is transient.");
+                    System.err.println("Warning: got error '"+e.toString()+"' on startup, will retry in 5 seconds in the hope it is transient.");
                     try
                     {
                         Thread.sleep(5000);