You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2013/12/20 18:51:52 UTC
svn commit: r1552764 - in /commons/proper/compress/trunk/src:
main/java/org/apache/commons/compress/archivers/sevenz/
main/java/org/apache/commons/compress/compressors/z/
test/java/org/apache/commons/compress/archivers/sevenz/
Author: sebb
Date: Fri Dec 20 17:51:51 2013
New Revision: 1552764
URL: http://svn.apache.org/r1552764
Log:
Explicit boxing
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java?rev=1552764&r1=1552763&r2=1552764&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZFile.java Fri Dec 20 17:51:51 2013
@@ -163,7 +163,7 @@ public class SevenZFile implements Close
final byte archiveVersionMinor = file.readByte();
if (archiveVersionMajor != 0) {
throw new IOException(String.format("Unsupported 7z version (%d,%d)",
- archiveVersionMajor, archiveVersionMinor));
+ Byte.valueOf(archiveVersionMajor), Byte.valueOf(archiveVersionMinor)));
}
final long startHeaderCrc = 0xffffFFFFL & Integer.reverseBytes(file.readInt());
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java?rev=1552764&r1=1552763&r2=1552764&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/z/ZCompressorInputStream.java Fri Dec 20 17:51:51 2013
@@ -124,7 +124,7 @@ public class ZCompressorInputStream exte
addRepeatOfPreviousCode();
addedUnfinishedEntry = true;
} else if (code > tableSize) {
- throw new IOException(String.format("Invalid %d bit code 0x%x", codeSize, code));
+ throw new IOException(String.format("Invalid %d bit code 0x%x", Integer.valueOf(codeSize), Integer.valueOf(code)));
}
return expandCodeToOutputStack(code, addedUnfinishedEntry);
}
Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java?rev=1552764&r1=1552763&r2=1552764&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFileTest.java Fri Dec 20 17:51:51 2013
@@ -274,12 +274,12 @@ public class SevenZOutputFileTest extend
assertEquals("foo/" + index + ".txt", entry.getName());
assertEquals(false, entry.isDirectory());
if (entry.getSize() == 0) {
- return false;
+ return Boolean.FALSE;
}
assertEquals(1, entry.getSize());
assertEquals(17, archive.read());
assertEquals(-1, archive.read());
- return true;
+ return Boolean.TRUE;
}
}