Stefan Bodewig
5 years ago
1 changed files with 3 additions and 5 deletions
Unified View
Diff Options
+ 3
- 5
src/main/org/apache/tools/ant/taskdefs/Concat.java
View File
| @@ -365,12 +365,10 @@ public class Concat extends Task implements ResourceCollection { | |||||
| private Reader getReader() throws IOException { | private Reader getReader() throws IOException { | ||||
| if (reader == null && readerSources.hasNext()) { | if (reader == null && readerSources.hasNext()) { | ||||
| reader = factory.getReader(readerSources.next()); | reader = factory.getReader(readerSources.next()); | ||||
| if(isFixLastLine()) | |||||
| { | |||||
| if (isFixLastLine()) { | |||||
| reader = new LastLineFixingReader(reader); | reader = new LastLineFixingReader(reader); | ||||
| } | } | ||||
| if(filterBeforeConcat) | |||||
| { | |||||
| if (filterBeforeConcat) { | |||||
| reader = getFilteredReader(reader); | reader = getFilteredReader(reader); | ||||
| } | } | ||||
| } | } | ||||
| @@ -463,7 +461,7 @@ public class Concat extends Task implements ResourceCollection { | |||||
| return result; | return result; | ||||
| } | } | ||||
| Reader resourceReader; | Reader resourceReader; | ||||
| if(filterBeforeConcat) { | |||||
| if (filterBeforeConcat) { | |||||
| resourceReader = new MultiReader<>(c.iterator(), | resourceReader = new MultiReader<>(c.iterator(), | ||||
| resourceReaderFactory, true); | resourceReaderFactory, true); | ||||
| } else { | } else { | ||||