From derby-commits-return-16282-apmail-db-derby-commits-archive=db.apache.org@db.apache.org Mon Nov 19 13:08:27 2012 Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 57EE2D58F for ; Mon, 19 Nov 2012 13:08:27 +0000 (UTC) Received: (qmail 24700 invoked by uid 500); 19 Nov 2012 13:08:27 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 24548 invoked by uid 500); 19 Nov 2012 13:08:22 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 24527 invoked by uid 99); 19 Nov 2012 13:08:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2012 13:08:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Nov 2012 13:08:21 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D954C23888E7; Mon, 19 Nov 2012 13:08:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1411160 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java Date: Mon, 19 Nov 2012 13:08:00 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121119130800.D954C23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Mon Nov 19 13:08:00 2012 New Revision: 1411160 URL: http://svn.apache.org/viewvc?rev=1411160&view=rev Log: DERBY-5998: Replication tests fail on CDC platforms without optional JSSE package Skip the replication tests if the optional package is not available. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java?rev=1411160&r1=1411159&r2=1411160&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationSuite.java Mon Nov 19 13:08:00 2012 @@ -48,6 +48,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. The tests also require