Author: bodewig
Date: Mon Oct 21 05:04:11 2013
New Revision: 1534025
URL: http://svn.apache.org/r1534025
Log:
FindBugs issues and comment a bunch of empty blocks
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedRandomAccessFileInputStream.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
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/archivers/sevenz/SevenZOutputFile.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedRandomAccessFileInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedRandomAccessFileInputStream.java?rev=1534025&r1=1534024&r2=1534025&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedRandomAccessFileInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/BoundedRandomAccessFileInputStream.java
Mon Oct 21 05:04:11 2013
@@ -59,5 +59,6 @@ class BoundedRandomAccessFileInputStream
@Override
public void close() {
+ // the nested RandomAccessFile is controlled externally
}
-}
\ No newline at end of file
+}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java?rev=1534025&r1=1534024&r2=1534025&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/Folder.java
Mon Oct 21 05:04:11 2013
@@ -24,6 +24,7 @@ class Folder {
/// List of coders used in this folder, eg. one for compression, one for
encryption.
Coder[] coders;
/// Total number of input streams across all coders.
+ /// this field is currently unused but technically part of the 7z API
long totalInputStreams;
/// Total number of output streams across all coders.
long totalOutputStreams;
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=1534025&r1=1534024&r2=1534025&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
Mon Oct 21 05:04:11 2013
@@ -92,7 +92,12 @@ public class SevenZFile {
this.file = new RandomAccessFile(filename, "r");
try {
archive = readHeaders(password);
- this.password = password;
+ if (password != null) {
+ this.password = new byte[password.length];
+ System.arraycopy(password, 0, this.password, 0,
password.length);
+ } else {
+ this.password = null;
+ }
succeeded = true;
} finally {
if (!succeeded) {
@@ -121,6 +126,9 @@ public class SevenZFile {
file.close();
} finally {
file = null;
+ if (password != null) {
+ Arrays.fill(password, (byte) 0);
+ }
password = null;
}
}
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java?rev=1534025&r1=1534024&r2=1534025&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/sevenz/SevenZOutputFile.java
Mon Oct 21 05:04:11 2013
@@ -658,10 +658,12 @@ public class SevenZOutputFile {
@Override
public void flush() throws IOException {
+ // no reason to flush a RandomAccessFile
}
@Override
public void close() throws IOException {
+ // the file will be closed by the containing class's close method
}
}
}
