antoine 2003/10/13 23:37:38
Modified: src/main/org/apache/tools/ant/taskdefs/optional/vss Tag:
ANT_16_BRANCH MSVSS.java
Log:
Check for null before checking for null strings
Revision Changes Path
No revision
No revision
1.34.2.2 +1 -1
ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
Index: MSVSS.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -u -r1.34.2.1 -r1.34.2.2
--- MSVSS.java 13 Oct 2003 18:23:33 -0000 1.34.2.1
+++ MSVSS.java 14 Oct 2003 06:37:38 -0000 1.34.2.2
@@ -419,7 +419,7 @@
// Use getShortLabel() so labels longer then 30 char are
truncated
// and the user is warned
String label = getShortLabel();
- if (!label.equals("") && label != null) {
+ if (label != null && !label.equals("")) {
return FLAG_VERSION_LABEL + label;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
