bad merge

src/main/org/apache/tools/ant/util/FlatFileNameMapper.java

@@ -52,7 +52,6 @@ public class FlatFileNameMapper implements FileNameMapper {
      */
     @Override
     public String[] mapFileName(String sourceFileName) {
-        return new String[] { new java.io.File(sourceFileName).getName() };
         return sourceFileName == null ? null
             : new String[] {new java.io.File(sourceFileName).getName()};
     }