Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 98368 invoked from network); 20 Mar 2009 13:05:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Mar 2009 13:05:34 -0000 Received: (qmail 27762 invoked by uid 500); 20 Mar 2009 13:05:33 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 27749 invoked by uid 500); 20 Mar 2009 13:05:33 -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 27740 invoked by uid 99); 20 Mar 2009 13:05:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 20 Mar 2009 06:05:33 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 20 Mar 2009 13:05:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9EC6D238896C; Fri, 20 Mar 2009 13:05:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r756441 - /db/derby/code/branches/10.3/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Date: Fri, 20 Mar 2009 13:05:10 -0000 To: derby-commits@db.apache.org From: kristwaa@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090320130510.9EC6D238896C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kristwaa Date: Fri Mar 20 13:05:09 2009 New Revision: 756441 URL: http://svn.apache.org/viewvc?rev=756441&view=rev Log: DERBY-4073: Creation/configuration of ClientXDataSource fails because of two setSsl methods. Replaced @code tag. Modified: db/derby/code/branches/10.3/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Modified: db/derby/code/branches/10.3/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java?rev=756441&r1=756440&r2=756441&view=diff ============================================================================== --- db/derby/code/branches/10.3/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java (original) +++ db/derby/code/branches/10.3/java/client/org/apache/derby/jdbc/ClientBaseDataSource.java Fri Mar 20 13:05:09 2009 @@ -196,7 +196,7 @@ * * @param s string denoting the SSL mode * @return A constant indicating the SSL mode denoted by the string. If the - * string is {@code null}, {@link #SSL_OFF} is returned. + * string is null, {@link #SSL_OFF} is returned. * @throws SqlException if the string has an invalid value */ public static final int getSSLModeFromString(String s)