You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by bu...@apache.org on 2006/03/15 02:42:55 UTC
DO NOT REPLY [Bug 38973] New: - Expand.jar protected void extractFile is coded wrong.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG�
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=38973>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND�
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=38973
Summary: Expand.jar protected void extractFile is coded wrong.
Product: Ant
Version: 1.6.5
Platform: All
OS/Version: other
Status: NEW
Severity: normal
Priority: P1
Component: Core tasks
AssignedTo: dev@ant.apache.org
ReportedBy: vijayvani@gmail.com
In the code below from extractFile method of Expand.jar I made the changes for
the fix. Search for ERROR and you will find the changes in two places.
PatternSet p = (PatternSet) patternsets.elementAt(v);
String[] incls = p.getIncludePatterns(getProject());
if (incls == null || incls.length == 0) {
// no include pattern implicitly means includes="**"
incls = new String[] {"**"};
}
for (int w = 0; w < incls.length; w++) {
String pattern = incls[w].replace('/', File.separatorChar)
.replace('\\', File.separatorChar);
if (pattern.endsWith(File.separator)) {
pattern += "**";
}
included = SelectorUtils.matchPath(pattern, name);
if (included) {
break;
}
}
if (!included) {
break; ERROR ----> Should be Continue!, because if not
found it should continue at the tope of the loop.
}
String[] excls = p.getExcludePatterns(getProject());
if (excls != null) {
for (int w = 0; w < excls.length; w++) {
String pattern = excls[w]
.replace('/', File.separatorChar)
.replace('\\', File.separatorChar);
if (pattern.endsWith(File.separator)) {
pattern += "**";
}
included = !(SelectorUtils.matchPath(pattern, name));
if (!included) {
break;
}
}
}
ERROR -----> these three lines should be added - so that we don't search
through the other patterns if it matches the first one.
if (included) {
break;
}
ERROR ---->Done Adding
}
if (!included) {
//Do not process this file
return;
}
}
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
DO NOT REPLY [Bug 38973] - Expand.jar protected void extractFile is coded wrong.
Posted by bu...@apache.org.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG�
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=38973>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND�
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=38973
bodewig@apache.org changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |dev@ant.apache.org
AssignedTo|dev@ant.apache.org |bodewig@apache.org
Status|NEEDINFO |NEW
------- Additional Comments From bodewig@apache.org 2006-04-29 14:27 -------
I think Vijay is correct with his first change, but wrong on the second.
Currently the code would only extract files that are matched by all patternsets
instead of at least one (that's what all the other tasks do) - this is the first
change.
In the second loop we do want to check against all patterns as long as the entry
doesn't match one of the excludes.
I'll add a testcase or two and change it.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
You are on the CC list for the bug, or are watching someone who is.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
DO NOT REPLY [Bug 38973] - Expand.jar protected void extractFile is coded wrong.
Posted by bu...@apache.org.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG�
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=38973>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND�
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=38973
bodewig@apache.org changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |RESOLVED
Resolution| |FIXED
Target Milestone|--- |1.7
------- Additional Comments From bodewig@apache.org 2006-04-29 14:57 -------
OK, the first change would have created problems with files that were included in
one and excluded in the second patternset.
I went ahead and simply merged all patternsets before applying patterns.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug, or are watching someone who is.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
DO NOT REPLY [Bug 38973] - Expand.jar protected void extractFile is coded wrong.
Posted by bu...@apache.org.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG�
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=38973>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND�
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=38973
kevin.jackson@it.fts-vn.com changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|NEW |NEEDINFO
------- Additional Comments From kevin.jackson@it.fts-vn.com 2006-03-15 02:14 -------
Could you describe the behaviour of the bug and demonstrate with a build file
and JUnit tests to prove that the changes in the code you described are correct?
It's also more useful if you provide a diff (svn diff - see the svn help) of the
source as it's more readable than the approach that you have chosen. We can
also apply diffs directly to our code using patch which makes the process of
incorporating contributions a little smoother.
Thanks for taking the time to look at the code, but please demonstrate the bug
with a build file and a JUnit test that reproduces the failure.
Kev
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org
DO NOT REPLY [Bug 38973] - Expand.jar protected void extractFile is coded wrong.
Posted by bu...@apache.org.
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG�
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=38973>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND�
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=38973
vijayvani@gmail.com changed:
What |Removed |Added
----------------------------------------------------------------------------
Severity|normal |major
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org