You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/05/28 22:42:01 UTC
svn commit: r1682331 - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/tomcat/util/codec/
java/org/apache/tomcat/util/codec/binary/ webapps/docs/
Author: markt
Date: Thu May 28 20:42:01 2015
New Revision: 1682331
URL: http://svn.apache.org/r1682331
Log:
Update fork of Apache Commons codec from r1609340 to r1682326.
Javadoc fixes only. No functional change.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/DecoderException.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/EncoderException.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 20:42:01 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,1655558,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682,1657
907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1666387,1666494,1666496,1666552,1666569,1666579,1666637,1666649,1
666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330
Propchange: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 28 20:42:01 2015
@@ -1 +1,2 @@
-/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1609340
+/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec:1459201-1682326
+/tomcat/trunk/java/org/apache/tomcat/util/codec:1682330
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/DecoderException.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/DecoderException.java?rev=1682331&r1=1682330&r2=1682331&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/DecoderException.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/DecoderException.java Thu May 28 20:42:01 2015
@@ -30,7 +30,7 @@ public class DecoderException extends Ex
private static final long serialVersionUID = 1L;
/**
- * Constructs a new exception with {@code null} as its detail message. The cause is not initialized, and may
+ * Constructs a new exception with <code>null</code> as its detail message. The cause is not initialized, and may
* subsequently be initialized by a call to {@link #initCause}.
*
* @since 1.4
@@ -59,7 +59,7 @@ public class DecoderException extends Ex
* @param message
* The detail message which is saved for later retrieval by the {@link #getMessage()} method.
* @param cause
- * The cause which is saved for later retrieval by the {@link #getCause()} method. A {@code null}
+ * The cause which is saved for later retrieval by the {@link #getCause()} method. A <code>null</code>
* value is permitted, and indicates that the cause is nonexistent or unknown.
* @since 1.4
*/
@@ -73,7 +73,7 @@ public class DecoderException extends Ex
* This constructor is useful for exceptions that are little more than wrappers for other throwables.
*
* @param cause
- * The cause which is saved for later retrieval by the {@link #getCause()} method. A {@code null}
+ * The cause which is saved for later retrieval by the {@link #getCause()} method. A <code>null</code>
* value is permitted, and indicates that the cause is nonexistent or unknown.
* @since 1.4
*/
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/EncoderException.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/EncoderException.java?rev=1682331&r1=1682330&r2=1682331&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/EncoderException.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/EncoderException.java Thu May 28 20:42:01 2015
@@ -31,7 +31,7 @@ public class EncoderException extends Ex
private static final long serialVersionUID = 1L;
/**
- * Constructs a new exception with {@code null} as its detail message. The cause is not initialized, and may
+ * Constructs a new exception with <code>null</code> as its detail message. The cause is not initialized, and may
* subsequently be initialized by a call to {@link #initCause}.
*
* @since 1.4
@@ -62,7 +62,7 @@ public class EncoderException extends Ex
* @param message
* The detail message which is saved for later retrieval by the {@link #getMessage()} method.
* @param cause
- * The cause which is saved for later retrieval by the {@link #getCause()} method. A {@code null}
+ * The cause which is saved for later retrieval by the {@link #getCause()} method. A <code>null</code>
* value is permitted, and indicates that the cause is nonexistent or unknown.
* @since 1.4
*/
@@ -76,7 +76,7 @@ public class EncoderException extends Ex
* This constructor is useful for exceptions that are little more than wrappers for other throwables.
*
* @param cause
- * The cause which is saved for later retrieval by the {@link #getCause()} method. A {@code null}
+ * The cause which is saved for later retrieval by the {@link #getCause()} method. A <code>null</code>
* value is permitted, and indicates that the cause is nonexistent or unknown.
* @since 1.4
*/
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java?rev=1682331&r1=1682330&r2=1682331&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/Base64.java Thu May 28 20:42:01 2015
@@ -35,6 +35,9 @@ import java.math.BigInteger;
* <li>Line separator: Default is CRLF ("\r\n")</li>
* </ul>
* <p>
+ * The URL-safe parameter is only applied to encode operations. Decoding seamlessly handles both modes.
+ * </p>
+ * <p>
* Since this class operates directly on byte streams, and not character streams, it is hard-coded to only
* encode/decode character encodings which are compatible with the lower 127 ASCII chart (ISO-8859-1, Windows-1252,
* UTF-8, etc).
@@ -171,8 +174,7 @@ public class Base64 extends BaseNCodec {
/**
* Creates a Base64 codec used for decoding (all modes) and encoding in the given URL-safe mode.
* <p>
- * When encoding the line length is 76, the line separator is CRLF, and the encoding table is
- * STANDARD_ENCODE_TABLE.
+ * When encoding the line length is 76, the line separator is CRLF, and the encoding table is STANDARD_ENCODE_TABLE.
* </p>
*
* <p>
@@ -180,7 +182,8 @@ public class Base64 extends BaseNCodec {
* </p>
*
* @param urlSafe
- * if {@code true}, URL-safe encoding is used. In most cases this should be set to {@code false}.
+ * if <code>true</code>, URL-safe encoding is used. In most cases this should be set to
+ * <code>false</code>.
* @since 1.4
*/
public Base64(final boolean urlSafe) {
@@ -483,7 +486,7 @@ public class Base64 extends BaseNCodec {
*
* @param octet
* The value to test
- * @return {@code true} if the value is defined in the the base 64 alphabet, {@code false} otherwise.
+ * @return <code>true</code> if the value is defined in the the base 64 alphabet, <code>false</code> otherwise.
* @since 1.4
*/
public static boolean isBase64(final byte octet) {
@@ -496,8 +499,8 @@ public class Base64 extends BaseNCodec {
*
* @param base64
* String to test
- * @return {@code true} if all characters in the String are valid characters in the Base64 alphabet or if
- * the String is empty; {@code false}, otherwise
+ * @return <code>true</code> if all characters in the String are valid characters in the Base64 alphabet or if
+ * the String is empty; <code>false</code>, otherwise
* @since 1.5
*/
public static boolean isBase64(final String base64) {
@@ -510,8 +513,8 @@ public class Base64 extends BaseNCodec {
*
* @param arrayOctet
* byte array to test
- * @return {@code true} if all bytes are valid characters in the Base64 alphabet or if the byte array is empty;
- * {@code false}, otherwise
+ * @return <code>true</code> if all bytes are valid characters in the Base64 alphabet or if the byte array is empty;
+ * <code>false</code>, otherwise
* @since 1.5
*/
public static boolean isBase64(final byte[] arrayOctet) {
@@ -592,7 +595,7 @@ public class Base64 extends BaseNCodec {
* @param binaryData
* Array containing binary data to encode.
* @param isChunked
- * if {@code true} this encoder will chunk the base64 output into 76 character blocks
+ * if <code>true</code> this encoder will chunk the base64 output into 76 character blocks
* @return Base64-encoded data.
* @throws IllegalArgumentException
* Thrown when the input array needs an output array bigger than {@link Integer#MAX_VALUE}
@@ -607,9 +610,9 @@ public class Base64 extends BaseNCodec {
* @param binaryData
* Array containing binary data to encode.
* @param isChunked
- * if {@code true} this encoder will chunk the base64 output into 76 character blocks
+ * if <code>true</code> this encoder will chunk the base64 output into 76 character blocks
* @param urlSafe
- * if {@code true} this encoder will emit - and _ instead of the usual + and / characters.
+ * if <code>true</code> this encoder will emit - and _ instead of the usual + and / characters.
* <b>Note: no padding is added when encoding using the URL-safe alphabet.</b>
* @return Base64-encoded data.
* @throws IllegalArgumentException
@@ -626,9 +629,9 @@ public class Base64 extends BaseNCodec {
* @param binaryData
* Array containing binary data to encode.
* @param isChunked
- * if {@code true} this encoder will chunk the base64 output into 76 character blocks
+ * if <code>true</code> this encoder will chunk the base64 output into 76 character blocks
* @param urlSafe
- * if {@code true} this encoder will emit - and _ instead of the usual + and / characters.
+ * if <code>true</code> this encoder will emit - and _ instead of the usual + and / characters.
* <b>Note: no padding is added when encoding using the URL-safe alphabet.</b>
* @param maxResultSize
* The maximum result size to accept.
@@ -658,7 +661,10 @@ public class Base64 extends BaseNCodec {
}
/**
- * Decodes a Base64 String into octets
+ * Decodes a Base64 String into octets.
+ * <p>
+ * <b>Note:</b> this method seamlessly handles data encoded in URL-safe or normal mode.
+ * </p>
*
* @param base64String
* String containing Base64 data
@@ -670,7 +676,10 @@ public class Base64 extends BaseNCodec {
}
/**
- * Decodes Base64 data into octets
+ * Decodes Base64 data into octets.
+ * <p>
+ * <b>Note:</b> this method seamlessly handles data encoded in URL-safe or normal mode.
+ * </p>
*
* @param base64Data
* Byte array containing Base64 data
@@ -689,7 +698,7 @@ public class Base64 extends BaseNCodec {
// Implementation of integer encoding used for crypto
/**
- * Decodes a byte64-encoded integer according to crypto standards such as W3C's XML-Signature
+ * Decodes a byte64-encoded integer according to crypto standards such as W3C's XML-Signature.
*
* @param pArray
* a byte array containing base64 character data
@@ -701,7 +710,7 @@ public class Base64 extends BaseNCodec {
}
/**
- * Encodes to a byte64-encoded integer according to crypto standards such as W3C's XML-Signature
+ * Encodes to a byte64-encoded integer according to crypto standards such as W3C's XML-Signature.
*
* @param bigInt
* a BigInteger
@@ -753,7 +762,7 @@ public class Base64 extends BaseNCodec {
*
* @param octet
* The value to test
- * @return {@code true} if the value is defined in the the Base64 alphabet {@code false} otherwise.
+ * @return <code>true</code> if the value is defined in the the Base64 alphabet <code>false</code> otherwise.
*/
@Override
protected boolean isInAlphabet(final byte octet) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java?rev=1682331&r1=1682330&r2=1682331&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/BaseNCodec.java Thu May 28 20:42:01 2015
@@ -255,6 +255,7 @@ public abstract class BaseNCodec impleme
*
* @param size minimum spare space required
* @param context the context to be used
+ * @return the buffer
*/
protected byte[] ensureBufferSize(final int size, final Context context){
if ((context.buffer == null) || (context.buffer.length < context.pos + size)){
@@ -441,7 +442,7 @@ public abstract class BaseNCodec impleme
*
* @param value The value to test
*
- * @return {@code true} if the value is defined in the current alphabet, {@code false} otherwise.
+ * @return <code>true</code> if the value is defined in the current alphabet, <code>false</code> otherwise.
*/
protected abstract boolean isInAlphabet(byte value);
@@ -450,10 +451,10 @@ public abstract class BaseNCodec impleme
* The method optionally treats whitespace and pad as valid.
*
* @param arrayOctet byte array to test
- * @param allowWSPad if {@code true}, then whitespace and PAD are also allowed
+ * @param allowWSPad if <code>true</code>, then whitespace and PAD are also allowed
*
- * @return {@code true} if all bytes are valid characters in the alphabet or if the byte array is empty;
- * {@code false}, otherwise
+ * @return <code>true</code> if all bytes are valid characters in the alphabet or if the byte array is empty;
+ * <code>false</code>, otherwise
*/
public boolean isInAlphabet(final byte[] arrayOctet, final boolean allowWSPad) {
for (int i = 0; i < arrayOctet.length; i++) {
@@ -470,8 +471,8 @@ public abstract class BaseNCodec impleme
* The method treats whitespace and PAD as valid.
*
* @param basen String to test
- * @return {@code true} if all characters in the String are valid characters in the alphabet or if
- * the String is empty; {@code false}, otherwise
+ * @return <code>true</code> if all characters in the String are valid characters in the alphabet or if
+ * the String is empty; <code>false</code>, otherwise
* @see #isInAlphabet(byte[], boolean)
*/
public boolean isInAlphabet(final String basen) {
@@ -485,7 +486,7 @@ public abstract class BaseNCodec impleme
*
* @param arrayOctet
* byte array to test
- * @return {@code true} if any byte is a valid character in the alphabet or PAD; {@code false} otherwise
+ * @return <code>true</code> if any byte is a valid character in the alphabet or PAD; <code>false</code> otherwise
*/
protected boolean containsAlphabetOrPad(final byte[] arrayOctet) {
if (arrayOctet == null) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java?rev=1682331&r1=1682330&r2=1682331&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/codec/binary/StringUtils.java Thu May 28 20:42:01 2015
@@ -37,7 +37,7 @@ public class StringUtils {
* @param string
* The string to encode (if null, return null).
* @param charset
- * The {@link Charset} to encode the {@code String}
+ * The {@link Charset} to encode the <code>String</code>
* @return the encoded bytes
*/
private static byte[] getBytes(final String string, final Charset charset) {
@@ -52,8 +52,8 @@ public class StringUtils {
* array.
*
* @param string
- * the String to encode, may be {@code null}
- * @return encoded bytes, or {@code null} if the input string was {@code null}
+ * the String to encode, may be <code>null</code>
+ * @return encoded bytes, or <code>null</code> if the input string was <code>null</code>
* @see <a href="http://download.oracle.com/javase/6/docs/api/java/nio/charset/Charset.html">Standard charsets</a>
*/
public static byte[] getBytesUtf8(final String string) {
@@ -66,9 +66,9 @@ public class StringUtils {
* @param bytes
* The bytes to be decoded into characters
* @param charset
- * The {@link Charset} to encode the {@code String}
+ * The {@link Charset} to encode the <code>String</code>
* @return A new <code>String</code> decoded from the specified array of bytes using the given charset,
- * or {@code null} if the input byte array was {@code null}.
+ * or <code>null</code> if the input byte array was <code>null</code>.
*/
private static String newString(final byte[] bytes, final Charset charset) {
return bytes == null ? null : new String(bytes, charset);
@@ -80,10 +80,9 @@ public class StringUtils {
* @param bytes
* The bytes to be decoded into characters
* @return A new <code>String</code> decoded from the specified array of bytes using the UTF-8 charset,
- * or {@code null} if the input byte array was {@code null}.
+ * or <code>null</code> if the input byte array was <code>null</code>.
*/
public static String newStringUtf8(final byte[] bytes) {
return newString(bytes, StandardCharsets.UTF_8);
}
-
}
Modified: tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml?rev=1682331&r1=1682330&r2=1682331&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Thu May 28 20:42:01 2015
@@ -111,6 +111,10 @@
Update package renamed Apache Commons File upload to r1682322 to pick up
the post 1.3.1 fixes. (markt)
</update>
+ <update>
+ Update package renamed Apache Commons Codes to r1682326. No functional
+ changes. Javadoc only. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org