conor 2003/02/18 05:21:08
Modified: src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
Concat.java
Log:
Merge
Revision Changes Path
No revision
No revision
1.5.2.6 +4 -3 ant/src/main/org/apache/tools/ant/taskdefs/Concat.java
Index: Concat.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/Concat.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -w -u -r1.5.2.5 -r1.5.2.6
--- Concat.java 10 Feb 2003 14:24:43 -0000 1.5.2.5
+++ Concat.java 18 Feb 2003 13:21:07 -0000 1.5.2.6
@@ -1,7 +1,7 @@
/*
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -359,8 +359,9 @@
// Make sure input != output.
if (destinationFile != null &&
destinationFile.getAbsolutePath().equals(input[i])) {
- log(destinationFile.getName() + ": input file is " +
- "output file.", Project.MSG_WARN);
+ throw new BuildException("Input file \""
+ + destinationFile.getName()
+ + "\" is the same as the output file.");
}
is = new FileInputStream(input[i]);
