You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2011/04/11 12:08:29 UTC
svn commit: r1091004 - in /db/derby/code/branches/10.8: ./
java/engine/org/apache/derby/impl/store/replication/slave/
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/
Author: kahatlen
Date: Mon Apr 11 10:08:28 2011
New Revision: 1091004
URL: http://svn.apache.org/viewvc?rev=1091004&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.8/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.8/ (props changed)
db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 11 10:08:28 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633
+/db/derby/code/trunk:1063809,1088633,1091000
Modified: db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java?rev=1091004&r1=1091003&r2=1091004&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java (original)
+++ db/derby/code/branches/10.8/java/engine/org/apache/derby/impl/store/replication/slave/SlaveController.java Mon Apr 11 10:08:28 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.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java?rev=1091004&r1=1091003&r2=1091004&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java Mon Apr 11 10:08:28 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;