From fce87997f7fd35b492b243ec733974d2c5891b41 Mon Sep 17 00:00:00 2001 From: Jimmy Casey Date: Sun, 29 Jul 2018 21:43:39 +0000 Subject: [PATCH 1/3] Fixed Spelling. This closes #66 pull request at github/apache/ant --- src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg | 2 +- src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg,v | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg b/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg index 357a0b035..ca6421233 100644 --- a/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg +++ b/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg @@ -8,7 +8,7 @@ # # Making sure that the entered bug-id number is correct. # Validating that the code that was reviewed is indeed the code being -# checked in (using the bug-id number or a seperate review +# checked in (using the bug-id number or a separate review # number to identify this particular code set.). # # If any of the above test failed, then the commit would be aborted. diff --git a/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg,v b/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg,v index d80fd0999..7ca9a333f 100644 --- a/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg,v +++ b/src/tests/antunit/taskdefs/cvs/repository/CVSROOT/verifymsg,v @@ -30,7 +30,7 @@ text # # Making sure that the entered bug-id number is correct. # Validating that the code that was reviewed is indeed the code being -# checked in (using the bug-id number or a seperate review +# checked in (using the bug-id number or a separate review # number to identify this particular code set.). # # If any of the above test failed, then the commit would be aborted. From ecae55dab487ded3877c5cad07d2cf0ffee19a8f Mon Sep 17 00:00:00 2001 From: Jaikiran Pai Date: Mon, 30 Jul 2018 19:02:18 +0530 Subject: [PATCH 2/3] Add Jimmy Casey to Contributors list, for the fce87997f7fd35b492b243ec733974d2c5891b41 commit --- CONTRIBUTORS | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 33cf2d432..7005c7562 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -191,6 +191,7 @@ Jerome Lacoste Jesse Glick Jesse Stockall Jim Allers +Jimmy Casey Joerg Wassmer Joel Tucci Joey Richey From 0949736bd21582723ba0b5fc3e374d0c76057b7d Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Sun, 12 Aug 2018 17:18:31 +0200 Subject: [PATCH 3/3] potential NPE --- src/main/org/apache/tools/ant/types/resources/Files.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/org/apache/tools/ant/types/resources/Files.java b/src/main/org/apache/tools/ant/types/resources/Files.java index a66b8ad0e..b34129166 100644 --- a/src/main/org/apache/tools/ant/types/resources/Files.java +++ b/src/main/org/apache/tools/ant/types/resources/Files.java @@ -497,7 +497,7 @@ public class Files extends AbstractSelectorContainer String[] includePatterns = ps.getIncludePatterns(getProject()); String[] excludePatterns = ps.getExcludePatterns(getProject()); return (includePatterns != null && includePatterns.length > 0) - || (includePatterns != null && excludePatterns.length > 0); + || (excludePatterns != null && excludePatterns.length > 0); } }