Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 90973 invoked from network); 12 Apr 2008 16:35:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Apr 2008 16:35:47 -0000 Received: (qmail 40920 invoked by uid 500); 12 Apr 2008 16:35:47 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 40892 invoked by uid 500); 12 Apr 2008 16:35:47 -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 40881 invoked by uid 99); 12 Apr 2008 16:35:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Apr 2008 09:35:47 -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.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Apr 2008 16:35:13 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 24D6A1A9832; Sat, 12 Apr 2008 09:35:26 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r647468 - in /db/derby/code/branches/10.4/java/engine/org/apache/derby: authentication/SystemPrincipal.java iapi/jdbc/DRDAServerStarter.java Date: Sat, 12 Apr 2008 16:35:25 -0000 To: derby-commits@db.apache.org From: dyre@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080412163526.24D6A1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dyre Date: Sat Apr 12 09:35:24 2008 New Revision: 647468 URL: http://svn.apache.org/viewvc?rev=647468&view=rev Log: Javadoc fixes (no jira). Merged to 10.4 with svn merge -r 636874:636875 ../derby-scratch No conflicts. Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/authentication/SystemPrincipal.java db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/authentication/SystemPrincipal.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/authentication/SystemPrincipal.java?rev=647468&r1=647467&r2=647468&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/engine/org/apache/derby/authentication/SystemPrincipal.java (original) +++ db/derby/code/branches/10.4/java/engine/org/apache/derby/authentication/SystemPrincipal.java Sat Apr 12 09:35:24 2008 @@ -41,7 +41,7 @@ *

* According to JAASRefGuide, Principal classes must implement Serializable. * - * @see Principal#name + * @see Principal#getName * @see JAASRefGuide on Principals */ final public class SystemPrincipal implements Principal, Serializable { Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java?rev=647468&r1=647467&r2=647468&view=diff ============================================================================== --- db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java (original) +++ db/derby/code/branches/10.4/java/engine/org/apache/derby/iapi/jdbc/DRDAServerStarter.java Sat Apr 12 09:35:24 2008 @@ -97,10 +97,11 @@ /** * Sets configuration information for the network server to be started. - * @param address InetAddress to listen on - * @param portNumber portNumber to listen on - * @param userName the user name for actions requiring authorization - * @param password the password for actions requiring authorization + * @param listenAddress InetAddress to listen on + * @param portNumber portNumber to listen on + * @param userName the user name for actions requiring authorization + * @param password the password for actions requiring authorization + * * @throws Exception on error * @see NetworkServerControl */