Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 64270 invoked from network); 4 Nov 2004 18:23:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 4 Nov 2004 18:23:33 -0000 Received: (qmail 80247 invoked by uid 500); 4 Nov 2004 18:23:18 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 80032 invoked by uid 500); 4 Nov 2004 18:23:16 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 79922 invoked by uid 99); 4 Nov 2004 18:23:14 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 04 Nov 2004 10:23:13 -0800 Received: (qmail 64008 invoked by uid 1203); 4 Nov 2004 18:23:12 -0000 Date: 4 Nov 2004 18:23:12 -0000 Message-ID: <20041104182312.64007.qmail@minotaur.apache.org> From: dims@apache.org To: ws-axis-cvs@apache.org Subject: cvs commit: ws-axis/java/src/org/apache/axis/components/encoding UTF16Encoder.java UTF8Encoder.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N dims 2004/11/04 10:23:12 Modified: java/src/org/apache/axis/components/encoding UTF16Encoder.java UTF8Encoder.java Log: Don't make a copy of the array...use it as is. Revision Changes Path 1.4 +3 -3 ws-axis/java/src/org/apache/axis/components/encoding/UTF16Encoder.java Index: UTF16Encoder.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/components/encoding/UTF16Encoder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- UTF16Encoder.java 26 Apr 2004 11:51:43 -0000 1.3 +++ UTF16Encoder.java 4 Nov 2004 18:23:12 -0000 1.4 @@ -47,10 +47,10 @@ if (xmlString == null) { return; } - char[] characters = xmlString.toCharArray(); + int length = xmlString.length(); char character; - for (int i = 0; i < characters.length; i++) { - character = characters[i]; + for (int i = 0; i < length; i++) { + character = xmlString.charAt( i ); switch (character) { // we don't care about single quotes since axis will // use double quotes anyway 1.4 +3 -21 ws-axis/java/src/org/apache/axis/components/encoding/UTF8Encoder.java Index: UTF8Encoder.java =================================================================== RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/components/encoding/UTF8Encoder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- UTF8Encoder.java 26 Apr 2004 11:51:43 -0000 1.3 +++ UTF8Encoder.java 4 Nov 2004 18:23:12 -0000 1.4 @@ -48,10 +48,10 @@ if (xmlString == null) { return; } - char[] characters = xmlString.toCharArray(); + int length = xmlString.length(); char character; - for (int i = 0; i < characters.length; i++) { - character = characters[i]; + for (int i = 0; i < length; i++) { + character = xmlString.charAt( i ); switch (character) { // we don't care about single quotes since axis will // use double quotes anyway @@ -86,24 +86,6 @@ writer.write("&#x"); writer.write(Integer.toHexString(character).toUpperCase()); writer.write(";"); - /* - TODO: Try fixing this block instead of code above. - if (character < 0x80) { - writer.write(character); - } else if (character < 0x800) { - writer.write((0xC0 | character >> 6)); - writer.write((0x80 | character & 0x3F)); - } else if (character < 0x10000) { - writer.write((0xE0 | character >> 12)); - writer.write((0x80 | character >> 6 & 0x3F)); - writer.write((0x80 | character & 0x3F)); - } else if (character < 0x200000) { - writer.write((0xF0 | character >> 18)); - writer.write((0x80 | character >> 12 & 0x3F)); - writer.write((0x80 | character >> 6 & 0x3F)); - writer.write((0x80 | character & 0x3F)); - } - */ } else { writer.write(character); }