peterreilly 2004/02/24 06:07:24
Modified: src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
PatternSet.java
. Tag: ANT_16_BRANCH WHATSNEW
Log:
Sync with head
Revision Changes Path
No revision
No revision
1.31.2.7 +5 -1 ant/src/main/org/apache/tools/ant/types/PatternSet.java
Index: PatternSet.java
===================================================================
RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/PatternSet.java,v
retrieving revision 1.31.2.6
retrieving revision 1.31.2.7
diff -u -r1.31.2.6 -r1.31.2.7
--- PatternSet.java 24 Feb 2004 13:23:34 -0000 1.31.2.6
+++ PatternSet.java 24 Feb 2004 14:07:23 -0000 1.31.2.7
@@ -122,7 +122,11 @@
* @return a printable form of this object.
*/
public String toString() {
- StringBuffer buf = new StringBuffer(name != null ? name : "");
+ if (name == null) {
+ throw new BuildException(
+ "Missing attribute \"name\" for a pattern");
+ }
+ StringBuffer buf = new StringBuffer(name);
if ((ifCond != null) || (unlessCond != null)) {
buf.append(":");
String connector = "";
No revision
No revision
1.503.2.46 +3 -1 ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/ant/WHATSNEW,v
retrieving revision 1.503.2.45
retrieving revision 1.503.2.46
diff -u -r1.503.2.45 -r1.503.2.46
--- WHATSNEW 24 Feb 2004 09:31:49 -0000 1.503.2.45
+++ WHATSNEW 24 Feb 2004 14:07:24 -0000 1.503.2.46
@@ -16,6 +16,8 @@
* MacroDef did not allow attributes named 'description'. Bugzilla Report
27175.
+* Throw build exception if name attribute missing from patternset. Bugzilla
Report 25982.
+
Other changes:
--------------
@@ -2879,4 +2881,4 @@
* The packagelistloc attribute of <javadoc>'s <link> child will be
resolved as a file (i.e. it is either absolute or relative to
- basedir).
\ No newline at end of file
+ basedir).
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
