Browse Source

Fix audit violations

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@270909 13f79535-47bb-0310-9956-ffa450edef68
master
Stephane Bailliez 24 years ago
parent
commit
cd917d00d8
5 changed files with 11 additions and 10 deletions
  1. +1
    -1
      src/main/org/apache/tools/ant/types/CommandlineJava.java
  2. +2
    -2
      src/main/org/apache/tools/ant/types/FileList.java
  3. +4
    -3
      src/main/org/apache/tools/ant/types/FileSet.java
  4. +2
    -2
      src/main/org/apache/tools/ant/types/FilterSet.java
  5. +2
    -2
      src/main/org/apache/tools/ant/types/PatternSet.java

+ 1
- 1
src/main/org/apache/tools/ant/types/CommandlineJava.java View File

@@ -93,7 +93,7 @@ public class CommandlineJava implements Cloneable {
Properties sys = null; Properties sys = null;


public String[] getVariables() throws BuildException { public String[] getVariables() throws BuildException {
String props[] = super.getVariables();
String[] props = super.getVariables();
if (props == null) { if (props == null) {
return null; return null;


+ 2
- 2
src/main/org/apache/tools/ant/types/FileList.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -145,7 +145,7 @@ public class FileList extends DataType {
throw new BuildException("No files specified for filelist."); throw new BuildException("No files specified for filelist.");
} }


String result[] = new String[filenames.size()];
String[] result = new String[filenames.size()];
filenames.copyInto(result); filenames.copyInto(result);
return result; return result;
} }


+ 4
- 3
src/main/org/apache/tools/ant/types/FileSet.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -290,13 +290,14 @@ public class FileSet extends DataType implements Cloneable {
ds.setBasedir(dir); ds.setBasedir(dir);


for (int i=0; i<additionalPatterns.size(); i++) {
final int count = additionalPatterns.size();
for (int i = 0; i < count; i++) {
Object o = additionalPatterns.elementAt(i); Object o = additionalPatterns.elementAt(i);
defaultPatterns.append((PatternSet) o, p); defaultPatterns.append((PatternSet) o, p);
} }


p.log( "FileSet: Setup file scanner in dir " + dir + p.log( "FileSet: Setup file scanner in dir " + dir +
" with " + defaultPatterns, p.MSG_DEBUG );
" with " + defaultPatterns, Project.MSG_DEBUG );
ds.setIncludes(defaultPatterns.getIncludePatterns(p)); ds.setIncludes(defaultPatterns.getIncludePatterns(p));
ds.setExcludes(defaultPatterns.getExcludePatterns(p)); ds.setExcludes(defaultPatterns.getExcludePatterns(p));


+ 2
- 2
src/main/org/apache/tools/ant/types/FilterSet.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 2001 The Apache Software Foundation. All rights
* Copyright (c) 2001-2002 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -427,7 +427,7 @@ public class FilterSet extends DataType implements Cloneable {
throw noChildrenAllowed(); throw noChildrenAllowed();
} }
for (Enumeration e = filterSet.getFilters().elements(); e.hasMoreElements();) { for (Enumeration e = filterSet.getFilters().elements(); e.hasMoreElements();) {
filters.addElement((Filter)e.nextElement());
filters.addElement(e.nextElement());
} }
} }


+ 2
- 2
src/main/org/apache/tools/ant/types/PatternSet.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * The Apache Software License, Version 1.1
* *
* Copyright (c) 2000-2001 The Apache Software Foundation. All rights
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -403,7 +403,7 @@ public class PatternSet extends DataType {
} }
} }


String result[] = new String[tmpNames.size()];
String[] result = new String[tmpNames.size()];
tmpNames.copyInto(result); tmpNames.copyInto(result);
return result; return result;
} }


Loading…
Cancel
Save