Author: markt
Date: Tue Jan 16 22:04:43 2018
New Revision: 1821327
URL: http://svn.apache.org/viewvc?rev=1821327&view=rev
Log:
Fix comment merge.
Align comments.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java?rev=1821327&r1=1821326&r2=1821327&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/buf/CharChunk.java Tue Jan
16 22:04:43 2018
@@ -308,6 +308,9 @@ public final class CharChunk extends Abs
/**
* Append a string to the buffer
+ *
+ * @param s The string
+ * @throws IOException Writing overflow data to the output channel failed
*/
public void append(String s) throws IOException {
append(s, 0, s.length());
@@ -585,7 +588,6 @@ public final class CharChunk extends Abs
/**
-<<<<<<< .working
* @deprecated Unused. Will be removed in Tomcat 8.0.x onwards.
*/
@Deprecated
@@ -611,18 +613,9 @@ public final class CharChunk extends Abs
/**
- * Returns true if the message bytes starts with the specified string.
- *
- * @param s the string
-||||||| .merge-left.r1821315
- * Returns true if the message bytes starts with the specified string.
- *
- * @param s the string
-=======
* @return <code>true</code> if the message bytes starts with the specified
* string.
* @param s The string
->>>>>>> .merge-right.r1821316
*/
public boolean startsWith(String s) {
char[] c = buff;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
