You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2013/03/19 12:56:27 UTC
svn commit: r1458236 - in /commons/proper/fileupload/trunk/src:
main/java/org/apache/commons/fileupload/util/mime/Base64Decoder.java
test/java/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.java
Author: simonetripodi
Date: Tue Mar 19 11:56:27 2013
New Revision: 1458236
URL: http://svn.apache.org/r1458236
Log:
[FILEUPLOAD-233] fixed and re-enabled the test case where an empty string doesn't need to be decoded
Modified:
commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/mime/Base64Decoder.java
commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.java
Modified: commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/mime/Base64Decoder.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/mime/Base64Decoder.java?rev=1458236&r1=1458235&r2=1458236&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/mime/Base64Decoder.java (original)
+++ commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload/util/mime/Base64Decoder.java Tue Mar 19 11:56:27 2013
@@ -92,6 +92,10 @@ final class Base64Decoder {
byte b1, b2, b3, b4;
int outLen = 0;
+ if (data.length == 0 || length == 0) {
+ return outLen;
+ }
+
int end = off + length;
while (end > 0) {
Modified: commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.java
URL: http://svn.apache.org/viewvc/commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.java?rev=1458236&r1=1458235&r2=1458236&view=diff
==============================================================================
--- commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.java (original)
+++ commons/proper/fileupload/trunk/src/test/java/org/apache/commons/fileupload/util/mime/Base64DecoderTestCase.java Tue Mar 19 11:56:27 2013
@@ -45,7 +45,7 @@ public final class Base64DecoderTestCase
*/
@Test
public void rfc4648Section10Decode() throws Exception {
- // assertEncoded("", "");
+ assertEncoded("", "");
assertEncoded("f", "Zg==");
assertEncoded("fo", "Zm8=");
// assertEncoded("foo", "Zm9v");