Return-Path: Delivered-To: apmail-james-mime4j-dev-archive@minotaur.apache.org Received: (qmail 90101 invoked from network); 27 Feb 2009 16:53:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Feb 2009 16:53:32 -0000 Received: (qmail 12402 invoked by uid 500); 27 Feb 2009 16:53:32 -0000 Delivered-To: apmail-james-mime4j-dev-archive@james.apache.org Received: (qmail 12378 invoked by uid 500); 27 Feb 2009 16:53:32 -0000 Mailing-List: contact mime4j-dev-help@james.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mime4j-dev@james.apache.org Delivered-To: mailing list mime4j-dev@james.apache.org Received: (qmail 12367 invoked by uid 99); 27 Feb 2009 16:53:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Feb 2009 08:53:32 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Feb 2009 16:53:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3D60A2388882; Fri, 27 Feb 2009 16:53:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r748587 - in /james/mime4j/trunk/src: main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java test/java/org/apache/james/mime4j/util/TestByteArrayBuffer.java Date: Fri, 27 Feb 2009 16:53:07 -0000 To: mime4j-dev@james.apache.org From: mwiederkehr@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090227165308.3D60A2388882@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mwiederkehr Date: Fri Feb 27 16:53:07 2009 New Revision: 748587 URL: http://svn.apache.org/viewvc?rev=748587&view=rev Log: removed ByteArrayBuffer.append(char[],int,int) because of naive character to byte conversion Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/TestByteArrayBuffer.java Modified: james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java?rev=748587&r1=748586&r2=748587&view=diff ============================================================================== --- james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java (original) +++ james/mime4j/trunk/src/main/java/org/apache/james/mime4j/util/ByteArrayBuffer.java Fri Feb 27 16:53:07 2009 @@ -90,28 +90,6 @@ this.len = newlen; } - public void append(final char[] b, int off, int len) { - if (b == null) { - return; - } - if ((off < 0) || (off > b.length) || (len < 0) || - ((off + len) < 0) || ((off + len) > b.length)) { - throw new IndexOutOfBoundsException(); - } - if (len == 0) { - return; - } - int oldlen = this.len; - int newlen = oldlen + len; - if (newlen > this.buffer.length) { - expand(newlen); - } - for (int i1 = off, i2 = oldlen; i2 < newlen; i1++, i2++) { - this.buffer[i2] = (byte) b[i1]; - } - this.len = newlen; - } - public void clear() { this.len = 0; } Modified: james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/TestByteArrayBuffer.java URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/TestByteArrayBuffer.java?rev=748587&r1=748586&r2=748587&view=diff ============================================================================== --- james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/TestByteArrayBuffer.java (original) +++ james/mime4j/trunk/src/test/java/org/apache/james/mime4j/util/TestByteArrayBuffer.java Fri Feb 27 16:53:07 2009 @@ -166,66 +166,4 @@ } } - public void testAppendCharArrayAsAscii() throws Exception { - String s1 = "stuff"; - String s2 = " and more stuff"; - char[] b1 = s1.toCharArray(); - char[] b2 = s2.toCharArray(); - - ByteArrayBuffer buffer = new ByteArrayBuffer(8); - buffer.append(b1, 0, b1.length); - buffer.append(b2, 0, b2.length); - - assertEquals(s1 + s2, new String(buffer.toByteArray(), "US-ASCII")); - } - - public void testAppendNullCharArray() throws Exception { - ByteArrayBuffer buffer = new ByteArrayBuffer(8); - buffer.append((char[])null, 0, 0); - assertEquals(0, buffer.length()); - } - - public void testAppendEmptyCharArray() throws Exception { - ByteArrayBuffer buffer = new ByteArrayBuffer(8); - buffer.append(new char[] {}, 0, 0); - assertEquals(0, buffer.length()); - } - - public void testInvalidAppendCharArrayAsAscii() throws Exception { - ByteArrayBuffer buffer = new ByteArrayBuffer(4); - buffer.append((char[])null, 0, 0); - - char[] tmp = new char[] { '1', '2', '3', '4'}; - try { - buffer.append(tmp, -1, 0); - fail("IndexOutOfBoundsException should have been thrown"); - } catch (IndexOutOfBoundsException ex) { - // expected - } - try { - buffer.append(tmp, 0, -1); - fail("IndexOutOfBoundsException should have been thrown"); - } catch (IndexOutOfBoundsException ex) { - // expected - } - try { - buffer.append(tmp, 0, 8); - fail("IndexOutOfBoundsException should have been thrown"); - } catch (IndexOutOfBoundsException ex) { - // expected - } - try { - buffer.append(tmp, 10, Integer.MAX_VALUE); - fail("IndexOutOfBoundsException should have been thrown"); - } catch (IndexOutOfBoundsException ex) { - // expected - } - try { - buffer.append(tmp, 2, 4); - fail("IndexOutOfBoundsException should have been thrown"); - } catch (IndexOutOfBoundsException ex) { - // expected - } - } - }