[jboss-svn-commits] JBL Code SVN: r27994 - labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery.

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

Author: adinn
Date: 2009-07-14 06:07:50 -0400 (Tue, 14 Jul 2009)
New Revision: 27994

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/RecoveryManagerStartStopTest.java
Log:
updated catch block to also catch SocketException which occurs on the test machines -- probably because they are using a real network address rather than localhost - fixes for JBTM-576

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/RecoveryManagerStartStopTest.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/RecoveryManagerStartStopTest.java	2009-07-14 09:09:16 UTC (rev 27993)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/tests/classes/com/hp/mwtests/ts/arjuna/recovery/RecoveryManagerStartStopTest.java	2009-07-14 10:07:50 UTC (rev 27994)
@@ -28,6 +28,7 @@
 import java.net.Socket;
 import java.net.InetAddress;
 import java.net.ServerSocket;
+import java.net.SocketException;
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
@@ -194,25 +195,36 @@
             try {
                 String result = fromServer.readLine();
                 if (result == null || result.equals("")) {
+                    System.out.println("Recovery Listener Client got empty string from readline() as expected");
                     System.out.flush();
-                    System.out.println("Recovery Listener Client got empty string from readline() as expected");
                     failed = false;
                 }
+            } catch (SocketException e) {
+                if (!connectorSocket.isClosed()) {
+                    try {
+                        connectorSocket.close();
+                    } catch (IOException e1) {
+                        // ignore
+                    }
+                }
+                System.out.println("Recovery Listener Client got socket exception as expected");
+                e.printStackTrace();
+                System.out.flush();
+                failed = false;
             } catch (IOException e) {
                 if (!connectorSocket.isClosed()) {
-                    System.out.println("Recovery Listener Client got IO exception without socket being closed");
-                    System.out.flush();
-                    e.printStackTrace();
+                    System.out.println("Recovery Listener Client got non socket IO exception without socket being closed");
                     try {
                         connectorSocket.close();
                     } catch (IOException e1) {
                         // ignore
                     }
                 } else {
-                    System.out.flush();
                     System.out.println("Recovery Listener Client got IO exception under readline() as expected");
                     failed = false;
                 }
+                e.printStackTrace();
+                System.out.flush();
             } catch (Exception e) {
                 System.out.println("Recovery Listener Client got non IO exception");
                 e.printStackTrace();