svn commit: r1150608 - in /commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip: ZipArchiveInputStream.java ZipArchiveOutputStream.java ZipUtil.java

[bodewig]

Author: bodewig
Date: Mon Jul 25 09:53:30 2011
New Revision: 1150608

URL: http://svn.apache.org/viewvc?rev=1150608&view=rev
Log:
use long returning methods in Java5's Inflater/Deflater.  Addresses 
COMPRESS-129.

Modified:
    
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
    
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
    
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java

Modified: 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java?rev=1150608&r1=1150607&r2=1150608&view=diff
==============================================================================
--- 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
 (original)
+++ 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
 Mon Jul 25 09:53:30 2011
@@ -420,7 +420,7 @@ public class ZipArchiveInputStream exten
 
             long inB;
             if (current.getMethod() == ZipArchiveOutputStream.DEFLATED) {
-                inB = inf.getTotalIn();
+                inB = inf.getBytesRead();
             } else {
                 inB = readBytesOfEntry;
             }

Modified: 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=1150608&r1=1150607&r2=1150608&view=diff
==============================================================================
--- 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
 (original)
+++ 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
 Mon Jul 25 09:53:30 2011
@@ -376,8 +376,8 @@ public class ZipArchiveOutputStream exte
                 deflate();
             }
 
-            entry.setSize(ZipUtil.adjustToLong(def.getTotalIn()));
-            entry.setCompressedSize(ZipUtil.adjustToLong(def.getTotalOut()));
+            entry.setSize(def.getBytesRead());
+            entry.setCompressedSize(def.getBytesWritten());
             entry.setCrc(realCrc);
 
             def.reset();

Modified: 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
URL: 
http://svn.apache.org/viewvc/commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java?rev=1150608&r1=1150607&r2=1150608&view=diff
==============================================================================
--- 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
 (original)
+++ 
commons/proper/compress/branches/zip64/src/main/java/org/apache/commons/compress/archivers/zip/ZipUtil.java
 Mon Jul 25 09:53:30 2011
@@ -69,6 +69,10 @@ public abstract class ZipUtil {
     /**
      * Assumes a negative integer really is a positive integer that
      * has wrapped around and re-creates the original value.
+     *
+     * <p>This methods is no longer used as of Apache Commons Compress
+     * 1.3</p>
+     *
      * @param i the value to treat as unsigned int.
      * @return the unsigned int as a long.
      */