db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1411163 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/NetCursor.java java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java
Date Mon, 19 Nov 2012 13:16:51 GMT
Author: kahatlen
Date: Mon Nov 19 13:16:50 2012
New Revision: 1411163

URL: http://svn.apache.org/viewvc?rev=1411163&view=rev
Log:
DERBY-5998: Replication tests fail on CDC platforms without optional JSSE package

Merged fix from trunk, revision 1411160.

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java   (props
changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1411160

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:r1411160

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=1411163&r1=1411162&r2=1411163&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 Nov 19 13:16:50 2012
@@ -47,6 +47,18 @@ public class ReplicationSuite extends Ba
 
 		TestSuite suite = new TestSuite("ReplicationSuite");
 
+        // DERBY-5998: The replication code uses javax.net.ServerSocketFactory
+        // to set up communication channels between the master and the slave.
+        // That class is only available in an optional part of the Foundation
+        // Profile API. Skip the replication tests if it is not available.
+        try {
+            Class.forName("javax.net.ServerSocketFactory");
+        } catch (ClassNotFoundException cnfe) {
+            println("Skipping replication tests since "
+                    + "javax.net.ServerSocketFactory is not available");
+            return suite;
+        }
+
         // The tests require both DriverManager and ClientDataSource. None
         // of those classes are available in JSR-169, so only run the test
         // on platforms that support JDBC3 and higher.



Mime
View raw message