You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2014/09/26 10:35:05 UTC
svn commit: r1627724 - in /tomcat/tc7.0.x/trunk: ./
java/javax/websocket/Session.java
java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
webapps/docs/changelog.xml
Author: violetagg
Date: Fri Sep 26 08:35:05 2014
New Revision: 1627724
URL: http://svn.apache.org/r1627724
Log:
Merged revision 1627531 from tomcat/trunk:
Fix broken Javadoc links
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/javax/websocket/Session.java
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1627531
Modified: tomcat/tc7.0.x/trunk/java/javax/websocket/Session.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/javax/websocket/Session.java?rev=1627724&r1=1627723&r2=1627724&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/javax/websocket/Session.java (original)
+++ tomcat/tc7.0.x/trunk/java/javax/websocket/Session.java Fri Sep 26 08:35:05 2014
@@ -41,12 +41,12 @@ public interface Session extends Closeab
* or
* {@link #addMessageHandler(Class, javax.websocket.MessageHandler.Whole)}.
*
- * @param listener The message handler for a incoming message
+ * @param handler The message handler for a incoming message
*
* @throws IllegalStateException If a message handler has already been
* registered for the associated message type
*/
- void addMessageHandler(MessageHandler listener) throws IllegalStateException;
+ void addMessageHandler(MessageHandler handler) throws IllegalStateException;
Set<MessageHandler> getMessageHandlers();
@@ -148,7 +148,7 @@ public interface Session extends Closeab
*
* @param clazz The type of message that the given handler is intended
* for
- * @param listener The message handler for a incoming message
+ * @param handler The message handler for a incoming message
*
* @throws IllegalStateException If a message handler has already been
* registered for the associated message type
@@ -163,7 +163,7 @@ public interface Session extends Closeab
*
* @param clazz The type of message that the given handler is intended
* for
- * @param listener The message handler for a incoming message
+ * @param handler The message handler for a incoming message
*
* @throws IllegalStateException If a message handler has already been
* registered for the associated message type
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java?rev=1627724&r1=1627723&r2=1627724&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/security/ConcurrentMessageDigest.java Fri Sep 26 08:35:05 2014
@@ -89,9 +89,9 @@ public class ConcurrentMessageDigest {
/**
- * Ensures that {@link #digest(String, byte[])} will support the specified
+ * Ensures that {@link #digest(String, byte[][])} will support the specified
* algorithm. This method <b>must</b> be called and return successfully
- * before using {@link #digest(String, byte[])}.
+ * before using {@link #digest(String, byte[][])}.
*
* @param algorithm The message digest algorithm to be supported
*
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1627724&r1=1627723&r2=1627724&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Sep 26 08:35:05 2014
@@ -305,6 +305,9 @@
Update the Windows authentication documentation after some additional
testing to answer the remaining questions. (markt)
</update>
+ <fix>
+ Correct a couple of broken links in the Javadoc. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org