From d2e06a2ad8f64fddc044e190b0092eb0dae5402d Mon Sep 17 00:00:00 2001
From: Antoine Levy-Lambert <antoine@apache.org>
Date: Tue, 14 Oct 2003 06:39:15 +0000
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java b/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
index 488bf5d4e..93ef91b60 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/vss/MSVSS.java
+++ b/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;
             }
         }