ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anto...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/taskdefs/optional/vss MSVSS.java
Date Fri, 04 Jul 2003 15:51:53 GMT
antoine     2003/07/04 08:51:53

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/vss
                        MSVSS.java
  Log:
  1) make sure that the -GTC flag on VSSGET only shows up when a timestamp has been set
  2) make sure that if you have label="" you are not going to have -VL-L in the command line
arguments
  
  Revision  Changes    Path
  1.32      +3 -3      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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- MSVSS.java	28 Apr 2003 15:46:02 -0000	1.31
  +++ MSVSS.java	4 Jul 2003 15:51:53 -0000	1.32
  @@ -377,7 +377,7 @@
        * @return    An empty string if label is not set.
        */
       protected String getLabel() {
  -        if (m_Label != null) {
  +        if (m_Label != null && m_Label.length()>0) {
               if (m_Label.length() > 31) {
                   String label = m_Label.substring(0, 30);
                   log("Label is longer than 31 characters, truncated to: " + label, Project.MSG_WARN);
  @@ -418,7 +418,7 @@
               // Use getLabel() so labels longer then 30 char are truncated
               // and the user is warned
               String label = getLabel();
  -            if (! label.equals("")) {
  +            if (! label.equals("") && label!=null) {
                   return FLAG_VERSION_LABEL + label;
               }
           }
  @@ -617,7 +617,7 @@
        */
       public String getFileTimeStamp() {
           if (m_timestamp == null) {
  -            return FLAG_FILETIME_DEF;
  +            return "";
           }
           else if (m_timestamp.getValue().equals(TIME_MODIFIED)) {
               return FLAG_FILETIME_MODIFIED;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org


Mime
View raw message