bodewig 02/04/10 23:32:43
Modified: src/main/org/apache/tools/ant/taskdefs Concat.java
src/testcases/org/apache/tools/ant/taskdefs WarTest.java
Log:
Don't reencode console output.
Revision Changes Path
1.3 +12 -6
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Concat.java
Index: Concat.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Concat.java 10 Apr 2002 15:33:09 -0000 1.2
+++ Concat.java 11 Apr 2002 06:32:43 -0000 1.3
@@ -388,21 +388,27 @@
BufferedReader in = null;
try {
- OutputStream os = null;
if (destinationFile == null) {
// Log using WARN so it displays in 'quiet' mode.
- os = new LogOutputStream(this, Project.MSG_WARN);
+ out = new PrintWriter(
+ new OutputStreamWriter(
+ new LogOutputStream(this, Project.MSG_WARN)
+ )
+ );
} else {
- os =
- new
FileOutputStream(destinationFile.getAbsolutePath(),
- append);
+ out = new PrintWriter(
+ new OutputStreamWriter(
+ new FileOutputStream(destinationFile
+ .getAbsolutePath(),
+ append),
+ encoding)
+ );
// This flag should only be recognized for the first
// file. In the context of a single 'cat', we always
// want to append.
append = true;
}
- out = new PrintWriter(new OutputStreamWriter(os, encoding));
for (int i = 0; i < len; i++) {
in = new BufferedReader(
1.2 +1 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java
Index: WarTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WarTest.java 11 Apr 2002 04:24:16 -0000 1.1
+++ WarTest.java 11 Apr 2002 06:32:43 -0000 1.2
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
