From 386d0634b9231190eb9b57509c7cccb74d8cc935 Mon Sep 17 00:00:00 2001 From: Magesh Umasankar Date: Tue, 14 Jan 2003 18:39:56 +0000 Subject: [PATCH] Translate not ignoring comment lines PR: 16042 Submitted by: morpheus@smi.stanford.edu (Mark Woon) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273798 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 ++ .../org/apache/tools/ant/taskdefs/optional/i18n/Translate.java | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WHATSNEW b/WHATSNEW index 8d2cfdda3..4efd27d57 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -19,6 +19,8 @@ Changes that could break older environments: Fixed bugs: ----------- +* was not ignoring comment lines. + * Expand tasks did not behave as expected with PatternSets. * now works on OS/400. diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java index 758fade17..c9cec6fb4 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/i18n/Translate.java @@ -410,8 +410,7 @@ public class Translate extends MatchingTask { String line = null; while ((line = in.readLine()) != null) { //So long as the line isn't empty and isn't a comment... - if (line.trim().length() > 1 && - ('#' != line.charAt(0) || '!' != line.charAt(0))) { + if (line.trim().length() > 1 && '#' != line.charAt(0) && '!' != line.charAt(0)) { //Legal Key-Value separators are :, = and white space. int sepIndex = line.indexOf('='); if (-1 == sepIndex) {