svn commit: r1154961 - /ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java

[bodewig]

Author: bodewig
Date: Mon Aug  8 13:40:24 2011
New Revision: 1154961

URL: http://svn.apache.org/viewvc?rev=1154961&view=rev
Log:
messed up permissions logic in AR with svn revision 1154951

Modified:
    ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java

Modified: 
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java
URL: 
http://svn.apache.org/viewvc/ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java?rev=1154961&r1=1154960&r2=1154961&view=diff
==============================================================================
--- 
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java 
(original)
+++ 
ant/antlibs/compress/trunk/src/main/org/apache/ant/compress/taskdefs/Ar.java 
Mon Aug  8 13:40:24 2011
@@ -65,6 +65,8 @@ public class Ar extends ArchiveBase {
 
                     int mode = ArchiveFileSet.DEFAULT_FILE_MODE;
                     if (r.getCollectionFlags().hasModeBeenSet()) {
+                        mode = r.getCollectionFlags().getMode();
+                    } else if (r.getResourceFlags().hasModeBeenSet()) {
                         mode = r.getResourceFlags().getMode();
                     }