Author: kkolinko
Date: Tue Feb 4 14:23:53 2014
New Revision: 1564317
URL: http://svn.apache.org/r1564317
Log:
Merged revisions r1564309, r1564312 from tomcat/trunk:
Fix javadoc markup (reviewing r1561778, r1561773).
Do not include unrelated text into the value of @version, @param.
Fix typo and unclosed <b> tag
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1564309,1564312
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1564317&r1=1564316&r2=1564317&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
Tue Feb 4 14:23:53 2014
@@ -80,9 +80,9 @@ public class XByteBuffer
protected boolean discard = true;
/**
- * Constructs a new XByteBuffer
- * @param size - the initial size of the byte buffer
+ * Constructs a new XByteBuffer.<br>
* TODO use a pool of byte[] for performance
+ * @param size - the initial size of the byte buffer
*/
public XByteBuffer(int size, boolean discard) {
buf = new byte[size];
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1564317&r1=1564316&r2=1564317&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
Tue Feb 4 14:23:53 2014
@@ -37,14 +37,14 @@ import org.apache.catalina.tribes.Member
* each time the object gets replicated the entire object gets serialized,
hence a call to <code>replicate(true)</code>
* will replicate all objects in this map that are using this node as primary.
*
- * <br><br><b>REMBER TO CALL <code>breakdown()</code> or
<code>finalize()</code> when you are done with the map to
- * avoid memory leaks.<br><br>
- * TODO implement periodic sync/transfer thread
- * @author Filip Hanik
- * @version 1.0
- *
+ * <br><br><b>REMEMBER TO CALL <code>breakdown()</code> or
<code>finalize()</code>
+ * when you are done with the map to avoid memory leaks.</b><br><br>
+ * TODO implement periodic sync/transfer thread<br>
* TODO memberDisappeared, should do nothing except change map membership
* by default it relocates the primary objects
+ *
+ * @author Filip Hanik
+ * @version 1.0
*/
public class ReplicatedMap extends AbstractReplicatedMap {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
