Merge from ANT_16_BRANCH

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275465 13f79535-47bb-0310-9956-ffa450edef68

src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java

@@ -419,7 +419,7 @@ public abstract class MSVSS extends Task implements MSVSSConstants {
             // 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;
             }
         }