You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2009/02/04 06:02:08 UTC
svn commit: r740605 - in
/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip:
./ ExtraFieldUtils.java ZipEntry.java ZipExtraField.java ZipFile.java
Author: bodewig
Date: Wed Feb 4 05:02:08 2009
New Revision: 740605
URL: http://svn.apache.org/viewvc?rev=740605&view=rev
Log:
merge revision 739300 from Ant - [SANDBOX-276]
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ (props changed)
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java (props changed)
Propchange: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/
------------------------------------------------------------------------------
svn:mergeinfo = /ant/core/trunk/src/main/org/apache/tools/zip:739300
Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java
URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java?rev=740605&r1=740604&r2=740605&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java (original)
+++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtils.java Wed Feb 4 05:02:08 2009
@@ -114,10 +114,6 @@
}
start += (length + WORD);
}
- if (start != data.length) { // array not exhausted
- throw new ZipException("data starting at " + start
- + " is in unknown format");
- }
ZipExtraField[] result = new ZipExtraField[v.size()];
v.copyInto(result);
Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java
URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java?rev=740605&r1=740604&r2=740605&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java (original)
+++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipEntry.java Wed Feb 4 05:02:08 2009
@@ -269,7 +269,7 @@
try {
setExtraFields(ExtraFieldUtils.parse(extra));
} catch (Exception e) {
- throw new RuntimeException(e.getMessage());
+ throw new RuntimeException(e.getMessage(), e);
}
}
Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java
URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java?rev=740605&r1=740604&r2=740605&view=diff
==============================================================================
--- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java (original)
+++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipExtraField.java Wed Feb 4 05:02:08 2009
@@ -66,8 +66,8 @@
byte[] getLocalFileDataData();
/**
- * The actual data to put central directory - without Header-ID or length
- * specifier.
+ * The actual data to put into central directory - without Header-ID or
+ * length specifier.
*
* @return The CentralDirectoryData value
* @since 1.1
Propchange: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipFile.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 4 05:02:08 2009
@@ -1 +1 @@
-/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:738853
+/ant/core/trunk/src/main/org/apache/tools/zip/ZipFile.java:738853,739300