Return-Path: 
 <notifications-return-8517-apmail-ant-notifications-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-notifications-archive@minotaur.apache.org
Received: (qmail 627 invoked from network); 19 Jun 2009 13:46:10 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 19 Jun 2009 13:46:10 -0000
Received: (qmail 84335 invoked by uid 500); 19 Jun 2009 13:46:21 -0000
Delivered-To: apmail-ant-notifications-archive@ant.apache.org
Received: (qmail 84310 invoked by uid 500); 19 Jun 2009 13:46:21 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 84301 invoked by uid 99); 19 Jun 2009 13:46:21 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2009 13:46:21 +0000
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, 19 Jun 2009 13:46:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 40F0623888DA; Fri, 19 Jun 2009 13:45:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r786506 - in /ant/core/trunk: WHATSNEW
 src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
 src/tests/antunit/taskdefs/loadproperties-test.xml
Date: Fri, 19 Jun 2009 13:45:59 -0000
To: notifications@ant.apache.org
From: bodewig@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090619134559.40F0623888DA@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: bodewig
Date: Fri Jun 19 13:45:58 2009
New Revision: 786506

URL: http://svn.apache.org/viewvc?rev=786506&view=rev
Log:
loadproperties' encoding attribute is broken.  PR 47382

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
    ant/core/trunk/src/tests/antunit/taskdefs/loadproperties-test.xml

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=786506&r1=786505&r2=786506&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jun 19 13:45:58 2009
@@ -385,6 +385,9 @@
    the setbeans attribute.
    Bugzilla Report 47336.
 
+ * <loadproperties>' encoding attribute didn't work.
+   Bugzilla Report 47382.
+
 Other changes:
 --------------
  * A HostInfo task was added performing information on hosts, including info on 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java?rev=786506&r1=786505&r2=786506&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/LoadProperties.java Fri Jun 19 13:45:58 2009
@@ -168,11 +168,7 @@
                 if (!text.endsWith("\n")) {
                     text = text + "\n";
                 }
-                if (encoding == null) {
-                    tis = new ByteArrayInputStream(text.getBytes());
-                } else {
-                    tis = new ByteArrayInputStream(text.getBytes(encoding));
-                }
+                tis = new ByteArrayInputStream(text.getBytes());
                 final Properties props = new Properties();
                 props.load(tis);
 

Modified: ant/core/trunk/src/tests/antunit/taskdefs/loadproperties-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/loadproperties-test.xml?rev=786506&r1=786505&r2=786506&view=diff
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/loadproperties-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/loadproperties-test.xml Fri Jun 19 13:45:58 2009
@@ -58,4 +58,14 @@
     <au:assertPropertyEquals name="xref-complex.f" value="$${xref-complex.d}" />
   </target>
 
+  <target name="testEncoding"
+          description="https://issues.apache.org/bugzilla/show_bug.cgi?id=47382">
+    <mkdir dir="${input}"/>
+    <echo file="${input}/ebcdic.properties" encoding="Cp1047">
+a=Hello world in EBCDIC
+    </echo>
+    <loadproperties srcfile="${input}/ebcdic.properties" encoding="Cp1047"/>
+    <au:assertPropertyEquals name="a" value="Hello world in EBCDIC"/>
+  </target>
+
 </project>