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 dy...@apache.org on 2008/04/12 18:35:25 UTC

svn commit: r647468 - in /db/derby/code/branches/10.4/java/engine/org/apache/derby: authentication/SystemPrincipal.java iapi/jdbc/DRDAServerStarter.java

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 @@
  * <p>
  * According to JAASRefGuide, Principal classes must implement Serializable.
  *
- * @see Principal#name
+ * @see Principal#getName
  * @see <a href="http://java.sun.com/javase/6/docs/technotes/guides/security/jaas/JAASRefGuide.html#Principals">JAASRefGuide on Principals</a> 
  */
 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
 	 */