db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1091081 - in /db/derby/code/branches/10.7: ./ java/engine/org/apache/derby/impl/store/replication/slave/ java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/
Date Mon, 11 Apr 2011 14:15:06 GMT
Author: kahatlen
Date: Mon Apr 11 14:15:06 2011
New Revision: 1091081

URL: http://svn.apache.org/viewvc?rev=1091081&view=rev
Log:
DERBY-4910: Four replication tests fail on z/OS with
junit.framework.AssertionFailedError: startMaster did not succeed.

Merged fix from trunk (revision 1091000).

Added:
    db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java
      - copied unchanged from r1091000, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun_Local_Derby4910.java
Modified:
    db/derby/code/branches/10.7/   (props changed)
    db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
    db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java

Propchange: db/derby/code/branches/10.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 11 14:15:06 2011
@@ -1 +1 @@
-/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338,1043227,1043389,1044096,1051026,1053724,1055169,1059888,1060480,1062096,1063809,1065061,1066290,1067250,1067357,1069661,1071463,1071886,1076387,1078461,1078693,1081455
+/db/derby/code/trunk:1035603,1036769,1038514,1038813,1039084,1039268,1040658,1041338,1043227,1043389,1044096,1051026,1053724,1055169,1059888,1060480,1062096,1063809,1065061,1066290,1067250,1067357,1069661,1071463,1071886,1076387,1078461,1078693,1081455,1091000

Modified: db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java?rev=1091081&r1=1091080&r2=1091081&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
(original)
+++ db/derby/code/branches/10.7/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
Mon Apr 11 14:15:06 2011
@@ -349,18 +349,13 @@ public class SlaveController
             return true; // will not reach this if timeout
         } catch (StandardException se) {
             throw se;
+        } catch (SocketTimeoutException ste) {
+            // Got a timeout. Return normally and let the caller retry.
+            return false;
         } catch (Exception e) {
-            // SocketTimeoutException is wrapped in
-            // PrivilegedActionException.
-            Throwable cause = e.getCause();
-            if (cause instanceof SocketTimeoutException) {
-                // Timeout! 
-                return false;
-            } else {
-                throw StandardException.newException
+            throw StandardException.newException
                     (SQLState.REPLICATION_CONNECTION_EXCEPTION, e,
                     dbname, getHostName(), String.valueOf(getPortNumber()));
-            }
         }
     }
 

Modified: db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java?rev=1091081&r1=1091080&r2=1091081&view=diff
==============================================================================
--- db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
(original)
+++ db/derby/code/branches/10.7/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
Mon Apr 11 14:15:06 2011
@@ -79,6 +79,8 @@ public class ReplicationSuite extends Ba
             suite.addTest(ReplicationRun_Local_Encrypted_1.suite());
 
             suite.addTest(ReplicationRun_Local_3_p6.suite());
+
+            suite.addTest(ReplicationRun_Local_Derby4910.suite());
         }
 
 		return suite;



Mime
View raw message