ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/build UpToDateCondition.java
Date Fri, 05 Jul 2002 03:29:06 GMT
donaldp     2002/07/04 20:29:06

  Modified:    antlib/src/java/org/apache/antlib/build
                        UpToDateCondition.java
  Log:
  Remove redundent null assignment
  
  Revision  Changes    Path
  1.3       +4 -6      jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/build/UpToDateCondition.java
  
  Index: UpToDateCondition.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/build/UpToDateCondition.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- UpToDateCondition.java	5 Jul 2002 03:21:52 -0000	1.2
  +++ UpToDateCondition.java	5 Jul 2002 03:29:06 -0000	1.3
  @@ -112,19 +112,17 @@
           throws TaskException
       {
           final SourceFileScanner scanner = new SourceFileScanner();
  -        FileNameMapper mapper = null;
  +
  +        FileNameMapper mapper = m_mapper;
           File dir = srcDir;
  -        if( m_mapper == null )
  +        if( mapper == null )
           {
               final MergingMapper mm = new MergingMapper();
               mm.setTo( m_targetFile.getAbsolutePath() );
               mapper = mm;
               dir = null;
           }
  -        else
  -        {
  -            mapper = m_mapper;
  -        }
  +
           return scanner.restrict( files, srcDir, dir, mapper, context ).length == 0;
       }
   }
  
  
  

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


Mime
View raw message