[prev in list] [next in list] [prev in thread] [next in thread] 

List:       jakarta-commons-dev
Subject:    svn commit: r760426 - in
From:       sebb () apache ! org
Date:       2009-03-31 13:01:29
Message-ID: 20090331130131.A486D2388979 () eris ! apache ! org
[Download RAW message or body]

Author: sebb
Date: Tue Mar 31 13:01:25 2009
New Revision: 760426

URL: http://svn.apache.org/viewvc?rev=760426&view=rev
Log:
Only set size if File#isFile() is true

Modified:
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
  commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
  commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java


Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
                
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apac \
he/commons/compress/archivers/ar/ArArchiveEntry.java?rev=760426&r1=760425&r2=760426&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java \
                (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java \
Tue Mar 31 13:01:25 2009 @@ -58,7 +58,7 @@
 
 	public ArArchiveEntry(File inputFile, String entryName) {
 	    // TODO sort out mode
-        this(entryName, inputFile.length(), 0, 0, 0, inputFile.lastModified());
+        this(entryName, inputFile.isFile() ? inputFile.length() : 0, 0, 0, 0, \
inputFile.lastModified());  }
 
     public long getSize() {

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
                
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apac \
he/commons/compress/archivers/cpio/CpioArchiveEntry.java?rev=760426&r1=760425&r2=760426&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java \
                (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java \
Tue Mar 31 13:01:25 2009 @@ -252,7 +252,7 @@
     }
 
     public CpioArchiveEntry(File inputFile, String entryName) {
-        this(entryName, inputFile.length());
+        this(entryName, inputFile.isFile() ? inputFile.length() : 0);
         long mode=0;
         if (inputFile.isDirectory()){
             mode |= C_ISDIR;

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java
                
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apac \
he/commons/compress/archivers/zip/ZipArchiveEntry.java?rev=760426&r1=760425&r2=760426&view=diff
 ==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java \
                (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntry.java \
Tue Mar 31 13:01:25 2009 @@ -87,7 +87,9 @@
 
     public ZipArchiveEntry(File inputFile, String entryName) {
         this(entryName);
-        setSize(inputFile.length());
+        if (inputFile.isFile()){
+            setSize(inputFile.length());
+        }
         setTime(inputFile.lastModified());
         // TODO are there any other fields we can set here?
     }


[prev in list] [next in list] [prev in thread] [next in thread]