svn commit: r742977 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress: archivers/ archivers/ar/ archivers/cpio/ archivers/jar/ archivers/tar/ archivers/zip/ compressors/ c
Author: bodewig
Date: Tue Feb 10 14:20:05 2009
New Revision: 742977
URL: http://svn.apache.org/viewvc?rev=742977view=rev
Log:
fix whitespace
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java?rev=742977r1=742976r2=742977view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveInputStream.java
Tue Feb 10 14:20:05 2009
@@ -23,11 +23,11 @@
public abstract class ArchiveInputStream extends InputStream {
- /**
+/**
* Returns the next Archive Entry in this Stream.
* @return the next entry
* @throws IOException if the next entry could not be read
*/
public abstract ArchiveEntry getNextEntry() throws IOException;
-
+
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java?rev=742977r1=742976r2=742977view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
Tue Feb 10 14:20:05 2009
@@ -29,6 +29,6 @@
}
public abstract void putArchiveEntry(ArchiveEntry entry) throws
IOException;
-
+
public abstract void closeArchiveEntry() throws IOException;
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java?rev=742977r1=742976r2=742977view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
Tue Feb 10 14:20:05 2009
@@ -28,15 +28,15 @@
private final InputStream input;
private long offset = 0;
-
+
public ArArchiveInputStream( final InputStream pInput ) {
input = pInput;
}
-
+
public ArchiveEntry getNextEntry() throws IOException {
-
+
if (offset == 0) {
-final
svn commit: r742984 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers: ar/ArArchiveOutputStream.java cpio/CpioArchiveOutputStream.java tar/TarOutputStream.java z
Author: bodewig
Date: Tue Feb 10 14:37:00 2009
New Revision: 742984
URL: http://svn.apache.org/viewvc?rev=742984view=rev
Log:
take advantage of FilterOutputStream
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java?rev=742984r1=742983r2=742984view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
Tue Feb 10 14:37:00 2009
@@ -146,11 +146,6 @@
entryOffset += len;
}
-public void write(byte[] b) throws IOException {
-out.write(b);
-entryOffset += b.length;
-}
-
public void close() throws IOException {
closeArchiveEntry();
out.close();
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java?rev=742984r1=742983r2=742984view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
Tue Feb 10 14:37:00 2009
@@ -422,10 +422,4 @@
this.putNextEntry((CpioArchiveEntry)entry);
}
-/* (non-Javadoc)
- * @see java.io.OutputStream#write(int)
- */
-public void write(int b) throws IOException {
-out.write(b);
-}
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java?rev=742984r1=742983r2=742984view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
Tue Feb 10 14:37:00 2009
@@ -244,18 +244,6 @@
}
/**
- * Writes bytes to the current tar archive entry.
- *
- * This method simply calls write( byte[], int, int ).
- *
- * @param wBuf The buffer to write to the archive.
- * @throws IOException on error
- */
-public void write(byte[] wBuf) throws IOException {
-write(wBuf, 0, wBuf.length);
-}
-
-/**
* Writes bytes to the current tar archive entry. This method
* is aware of the current entry and will throw an exception if
* you attempt to write bytes past the length specified for the
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=742984r1=742983r2=742984view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Tue Feb 10 14:37:00 2009
@@ -552,19 +552,6 @@
}
}
-/**
- * Flushes this output stream and forces any buffered output bytes
- * to be written out to the stream.
- *
- * @exception IOException if an I/O error occurs.
- * @since 1.14
- */
-public void flush() throws IOException {
-if (out != null) {
-out.flush();
-}
-}
-
public void putArchiveEntry(ArchiveEntry entry) throws IOException {
putNextEntry((ZipArchiveEntry) entry);
}
svn commit: r742985 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors: CompressorOutputStream.java bzip2/BZip2CompressorOutputStream.java gzip/GzipCompressorOu
Author: bodewig
Date: Tue Feb 10 14:45:08 2009
New Revision: 742985
URL: http://svn.apache.org/viewvc?rev=742985view=rev
Log:
Make CompressorOutputStream extend FilterStream
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorOutputStream.java?rev=742985r1=742984r2=742985view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorOutputStream.java
Tue Feb 10 14:45:08 2009
@@ -18,8 +18,12 @@
*/
package org.apache.commons.compress.compressors;
+import java.io.FilterOutputStream;
import java.io.OutputStream;
-public abstract class CompressorOutputStream extends OutputStream {
+public abstract class CompressorOutputStream extends FilterOutputStream {
// TODO
+protected CompressorOutputStream(final OutputStream o) {
+super(o);
+}
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java?rev=742985r1=742984r2=742985view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
Tue Feb 10 14:45:08 2009
@@ -272,6 +272,7 @@
public BZip2CompressorOutputStream(OutputStream inStream, int inBlockSize)
throws IOException {
+super(inStream);
block = null;
quadrant = null;
zptr = null;
@@ -377,7 +378,7 @@
}
finish();
super.close();
-bsStream.close();
+out.close();
closed = true;
}
@@ -396,7 +397,7 @@
public void flush() throws IOException {
super.flush();
-bsStream.flush();
+out.flush();
}
private int blockCRC, combinedCRC;
@@ -516,7 +517,7 @@
}
private void bsSetStream(OutputStream f) {
-bsStream = f;
+out = f;
bsLive = 0;
bsBuff = 0;
bytesOut = 0;
@@ -526,7 +527,7 @@
while (bsLive 0) {
int ch = (bsBuff 24);
try {
-bsStream.write(ch); // write 8-bit
+out.write(ch); // write 8-bit
} catch (IOException e) {
throw e;
}
@@ -540,7 +541,7 @@
while (bsLive = 8) {
int ch = (bsBuff 24);
try {
-bsStream.write(ch); // write 8-bit
+out.write(ch); // write 8-bit
} catch (IOException e) {
throw e;
}
@@ -887,8 +888,6 @@
sendMTFValues();
}
-private OutputStream bsStream;
-
private void simpleSort(int lo, int hi, int d) {
int i, j, h, bigN, hp;
int v;
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java?rev=742985r1=742984r2=742985view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
Tue Feb 10 14:45:08 2009
@@ -26,18 +26,8 @@
public class GzipCompressorOutputStream extends CompressorOutputStream {
-private final GZIPOutputStream out;
-
public GzipCompressorOutputStream( final OutputStream outputStream )
throws IOException {
-out = new GZIPOutputStream(outputStream);
-}
-
-public void write(int b) throws IOException {
-out.write(b);
-}
-
-public void close() throws IOException {
-out.close();
+
svn commit: r742987 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors: CompressorInputStream.java bzip2/BZip2CompressorInputStream.java gzip/GzipCompressorInpu
Author: bodewig
Date: Tue Feb 10 14:53:54 2009
New Revision: 742987
URL: http://svn.apache.org/viewvc?rev=742987view=rev
Log:
Make CompressorInputStream extend FilterInputStream
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java?rev=742987r1=742986r2=742987view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
Tue Feb 10 14:53:54 2009
@@ -18,8 +18,12 @@
*/
package org.apache.commons.compress.compressors;
+import java.io.FilterInputStream;
import java.io.InputStream;
-public abstract class CompressorInputStream extends InputStream {
+public abstract class CompressorInputStream extends FilterInputStream {
// TODO
+protected CompressorInputStream(final InputStream i) {
+super(i);
+}
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java?rev=742987r1=742986r2=742987view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
Tue Feb 10 14:53:54 2009
@@ -80,8 +80,6 @@
private int nInUse;
-private InputStream in;
-
private int currentChar = -1;
private static final int EOF = 0;
@@ -132,9 +130,8 @@
* if ttin == null/tt
*/
public BZip2CompressorInputStream(final InputStream in) throws IOException
{
-super();
+super(in);
-this.in = in;
init();
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java?rev=742987r1=742986r2=742987view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
Tue Feb 10 14:53:54 2009
@@ -26,14 +26,8 @@
public class GzipCompressorInputStream extends CompressorInputStream {
-private final GZIPInputStream in;
-
public GzipCompressorInputStream(InputStream inputStream) throws
IOException {
-in = new GZIPInputStream(inputStream);
-}
-
-public int read() throws IOException {
-return in.read();
+super(new GZIPInputStream(inputStream));
}
}
svn commit: r742990 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress: archivers/ar/ archivers/cpio/ archivers/tar/ archivers/zip/ compressors/ compressors/bzip2/ compress
Author: bodewig
Date: Tue Feb 10 15:11:22 2009
New Revision: 742990
URL: http://svn.apache.org/viewvc?rev=742990view=rev
Log:
revert Filter*Stream patches since they do more harm than help
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/CompressorOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorOutputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java?rev=742990r1=742989r2=742990view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
Tue Feb 10 15:11:22 2009
@@ -146,6 +146,11 @@
entryOffset += len;
}
+public void write(byte[] b) throws IOException {
+out.write(b);
+entryOffset += b.length;
+}
+
public void close() throws IOException {
closeArchiveEntry();
out.close();
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java?rev=742990r1=742989r2=742990view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
Tue Feb 10 15:11:22 2009
@@ -422,4 +422,10 @@
this.putNextEntry((CpioArchiveEntry)entry);
}
+/* (non-Javadoc)
+ * @see java.io.OutputStream#write(int)
+ */
+public void write(int b) throws IOException {
+out.write(b);
+}
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java?rev=742990r1=742989r2=742990view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
Tue Feb 10 15:11:22 2009
@@ -244,6 +244,18 @@
}
/**
+ * Writes bytes to the current tar archive entry.
+ *
+ * This method simply calls write( byte[], int, int ).
+ *
+ * @param wBuf The buffer to write to the archive.
+ * @throws IOException on error
+ */
+public void write(byte[] wBuf) throws IOException {
+write(wBuf, 0, wBuf.length);
+}
+
+/**
* Writes bytes to the current tar archive entry. This method
* is aware of the current entry and will throw an exception if
* you attempt to write bytes past the length specified for the
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=742990r1=742989r2=742990view=diff
==
---
svn commit: r742997 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers: ./ ar/ cpio/ tar/ zip/
Author: bodewig
Date: Tue Feb 10 15:35:35 2009
New Revision: 742997
URL: http://svn.apache.org/viewvc?rev=742997view=rev
Log:
no longer extende FilterOutputStream in ArchiveOutputStream
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java?rev=742997r1=742996r2=742997view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveOutputStream.java
Tue Feb 10 15:35:35 2009
@@ -19,14 +19,9 @@
package org.apache.commons.compress.archivers;
import java.io.IOException;
-import java.io.FilterOutputStream;
import java.io.OutputStream;
-public abstract class ArchiveOutputStream extends FilterOutputStream {
-
-protected ArchiveOutputStream(OutputStream other) {
-super(other);
-}
+public abstract class ArchiveOutputStream extends OutputStream {
public abstract void putArchiveEntry(ArchiveEntry entry) throws
IOException;
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java?rev=742997r1=742996r2=742997view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveOutputStream.java
Tue Feb 10 15:35:35 2009
@@ -26,12 +26,13 @@
public class ArArchiveOutputStream extends ArchiveOutputStream {
+private final OutputStream out;
private long archiveOffset = 0;
private long entryOffset = 0;
private ArArchiveEntry prevEntry;
public ArArchiveOutputStream( final OutputStream pOut ) {
-super(pOut);
+this.out = pOut;
}
private long writeArchiveHeader() throws IOException {
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java?rev=742997r1=742996r2=742997view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveOutputStream.java
Tue Feb 10 15:35:35 2009
@@ -70,6 +70,8 @@
private long written;
+private final OutputStream out;
+
/**
* Check to make sure that this stream has not been closed
*
@@ -88,7 +90,7 @@
* @param format The format of the stream
*/
public CpioArchiveOutputStream(final OutputStream out, final short format)
{
-super(out);
+this.out = new FilterOutputStream(out);
setFormat(format);
}
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java?rev=742997r1=742996r2=742997view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
Tue Feb 10 15:35:35 2009
@@ -26,8 +26,10 @@
public class TarArchiveOutputStream extends ArchiveOutputStream {
+private final TarOutputStream out;
+
public TarArchiveOutputStream(OutputStream out) {
-super(new
svn commit: r743003 - in /commons/sandbox/compress/trunk/src: main/java/org/apache/commons/compress/archivers/ main/java/org/apache/commons/compress/archivers/tar/ test/java/org/apache/commons/compres
Author: bodewig
Date: Tue Feb 10 15:57:46 2009
New Revision: 743003
URL: http://svn.apache.org/viewvc?rev=743003view=rev
Log:
merge TarArchive*Stream with Tar*Stream
Removed:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java?rev=743003r1=743002r2=743003view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
Tue Feb 10 15:57:46 2009
@@ -28,8 +28,8 @@
import org.apache.commons.compress.archivers.cpio.CpioArchiveOutputStream;
import org.apache.commons.compress.archivers.jar.JarArchiveInputStream;
import org.apache.commons.compress.archivers.jar.JarArchiveOutputStream;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
+import org.apache.commons.compress.archivers.tar.TarInputStream;
+import org.apache.commons.compress.archivers.tar.TarOutputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
@@ -52,7 +52,7 @@
} else if(zip.equalsIgnoreCase(archiverName)) {
return new ZipArchiveInputStream(in);
} else if(tar.equalsIgnoreCase(archiverName)) {
-return new TarArchiveInputStream(in);
+return new TarInputStream(in);
} else if(jar.equalsIgnoreCase(archiverName)) {
return new JarArchiveInputStream(in);
} else if(cpio.equalsIgnoreCase(archiverName)) {
@@ -67,7 +67,7 @@
} else if(zip.equalsIgnoreCase(archiverName)) {
return new ZipArchiveOutputStream(out);
} else if(tar.equalsIgnoreCase(archiverName)) {
-return new TarArchiveOutputStream(out);
+return new TarOutputStream(out);
} else if(jar.equalsIgnoreCase(archiverName)) {
return new JarArchiveOutputStream(out);
} else if(cpio.equalsIgnoreCase(archiverName)) {
@@ -88,8 +88,8 @@
return new ZipArchiveInputStream(input);
} else if(JarArchiveInputStream.matches(signature, signatureLength)) {
return new JarArchiveInputStream(input);
-} else if(TarArchiveInputStream.matches(signature, signatureLength)) {
-return new TarArchiveInputStream(input);
+} else if(TarInputStream.matches(signature, signatureLength)) {
+return new TarInputStream(input);
} else if(ArArchiveInputStream.matches(signature, signatureLength)) {
return new ArArchiveInputStream(input);
} else if(CpioArchiveInputStream.matches(signature, signatureLength)) {
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarInputStream.java?rev=743003r1=743002r2=743003view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarInputStream.java
Tue Feb 10 15:57:46 2009
@@ -23,10 +23,11 @@
package org.apache.commons.compress.archivers.tar;
-import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.ArchiveInputStream;
/**
* The TarInputStream reads a UNIX tar archive as an InputStream.
@@ -35,7 +36,7 @@
* using read().
*
*/
-public class TarInputStream extends FilterInputStream {
+public class TarInputStream extends ArchiveInputStream {
private static final int
svn commit: r743006 - in /commons/sandbox/compress/trunk/src: main/java/org/apache/commons/compress/archivers/ main/java/org/apache/commons/compress/archivers/tar/ test/java/org/apache/commons/compres
Author: bodewig
Date: Tue Feb 10 16:10:45 2009
New Revision: 743006
URL: http://svn.apache.org/viewvc?rev=743006view=rev
Log:
rename Tar*Stream
Added:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
Removed:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarOutputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/DetectArchiverTestCase.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java?rev=743006r1=743005r2=743006view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ArchiveStreamFactory.java
Tue Feb 10 16:10:45 2009
@@ -28,8 +28,8 @@
import org.apache.commons.compress.archivers.cpio.CpioArchiveOutputStream;
import org.apache.commons.compress.archivers.jar.JarArchiveInputStream;
import org.apache.commons.compress.archivers.jar.JarArchiveOutputStream;
-import org.apache.commons.compress.archivers.tar.TarInputStream;
-import org.apache.commons.compress.archivers.tar.TarOutputStream;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.archivers.tar.TarArchiveOutputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
@@ -52,7 +52,7 @@
} else if(zip.equalsIgnoreCase(archiverName)) {
return new ZipArchiveInputStream(in);
} else if(tar.equalsIgnoreCase(archiverName)) {
-return new TarInputStream(in);
+return new TarArchiveInputStream(in);
} else if(jar.equalsIgnoreCase(archiverName)) {
return new JarArchiveInputStream(in);
} else if(cpio.equalsIgnoreCase(archiverName)) {
@@ -67,7 +67,7 @@
} else if(zip.equalsIgnoreCase(archiverName)) {
return new ZipArchiveOutputStream(out);
} else if(tar.equalsIgnoreCase(archiverName)) {
-return new TarOutputStream(out);
+return new TarArchiveOutputStream(out);
} else if(jar.equalsIgnoreCase(archiverName)) {
return new JarArchiveOutputStream(out);
} else if(cpio.equalsIgnoreCase(archiverName)) {
@@ -88,8 +88,8 @@
return new ZipArchiveInputStream(input);
} else if(JarArchiveInputStream.matches(signature, signatureLength)) {
return new JarArchiveInputStream(input);
-} else if(TarInputStream.matches(signature, signatureLength)) {
-return new TarInputStream(input);
+} else if(TarArchiveInputStream.matches(signature, signatureLength)) {
+return new TarArchiveInputStream(input);
} else if(ArArchiveInputStream.matches(signature, signatureLength)) {
return new ArArchiveInputStream(input);
} else if(CpioArchiveInputStream.matches(signature, signatureLength)) {
Added:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java?rev=743006view=auto
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
(added)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
Tue Feb 10 16:10:45 2009
@@ -0,0 +1,431 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the
svn commit: r743014 - /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java
Author: bodewig Date: Tue Feb 10 16:51:22 2009 New Revision: 743014 URL: http://svn.apache.org/viewvc?rev=743014view=rev Log: reduce accessibilty of constant byte-arrays. Findbugs issue, SANDBOX-246 Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java Modified: commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java?rev=743014r1=743013r2=743014view=diff == --- commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java (original) +++ commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStream.java Tue Feb 10 16:51:22 2009 @@ -591,25 +591,25 @@ * * @since 1.1 */ -protected static final byte[] LFH_SIG = ZipLong.getBytes(0X04034B50L); +static final byte[] LFH_SIG = ZipLong.getBytes(0X04034B50L); /** * data descriptor signature * * @since 1.1 */ -protected static final byte[] DD_SIG = ZipLong.getBytes(0X08074B50L); +static final byte[] DD_SIG = ZipLong.getBytes(0X08074B50L); /** * central file header signature * * @since 1.1 */ -protected static final byte[] CFH_SIG = ZipLong.getBytes(0X02014B50L); +static final byte[] CFH_SIG = ZipLong.getBytes(0X02014B50L); /** * end of central dir signature * * @since 1.1 */ -protected static final byte[] EOCD_SIG = ZipLong.getBytes(0X06054B50L); +static final byte[] EOCD_SIG = ZipLong.getBytes(0X06054B50L); /** * Writes next block of compressed data to the output stream.
svn commit: r743097 - /commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
Author: dfabulich
Date: Tue Feb 10 20:52:10 2009
New Revision: 743097
URL: http://svn.apache.org/viewvc?rev=743097view=rev
Log:
[DBUTILS-37] BeanListHandler#handle(ResultSet) is not optimal
Submitted by: Julien Aymé
Julien's patch created a separate OptimalBeanListHandler to avoid breaking
users who had extended BeanListHandler; I chose to just replace the existing
one rather than clutter the API
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
Modified:
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java?rev=743097r1=743096r2=743097view=diff
==
---
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
(original)
+++
commons/sandbox/dbutils/bugfixing/src/java/org/apache/commons/dbutils/handlers/BeanListHandler.java
Tue Feb 10 20:52:10 2009
@@ -19,6 +19,7 @@
import java.sql.ResultSet;
import java.sql.SQLException;
+import org.apache.commons.dbutils.ResultSetHandler;
import org.apache.commons.dbutils.RowProcessor;
/**
@@ -28,7 +29,7 @@
*
* @see org.apache.commons.dbutils.ResultSetHandler
*/
-public class BeanListHandler extends GenericListHandler {
+public class BeanListHandler implements ResultSetHandler {
/**
* The Class of beans produced by this handler.
@@ -65,16 +66,17 @@
}
/**
- * Convert the codeResultSet/code row into a bean with
+ * Convert the whole codeResultSet/code into a List of beans with
* the codeClass/code given in the constructor.
*
- * @return A bean, never codenull/code.
+ * @param rs The codeResultSet/code to handle.
+ *
+ * @return A List of beans, never codenull/code.
*
* @throws SQLException if a database access error occurs
- * @see
org.apache.commons.dbutils.handlers.GenericListHandler#handle(ResultSet)
+ * @see org.apache.commons.dbutils.RowProcessor#toBeanList(ResultSet,
Class)
*/
-protected Object handleRow(ResultSet rs) throws SQLException {
-return this.convert.toBean(rs, type);
+public Object handle(ResultSet rs) throws SQLException {
+return this.convert.toBeanList(rs, type);
}
-
}
svn commit: r743259 - in /commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers: ar/ cpio/ jar/ tar/ zip/
Author: bodewig
Date: Wed Feb 11 07:44:00 2009
New Revision: 743259
URL: http://svn.apache.org/viewvc?rev=743259view=rev
Log:
provide convenience getNext*Entry methods to ArchiveInputStream subclasses
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java?rev=743259r1=743258r2=743259view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveInputStream.java
Wed Feb 11 07:44:00 2009
@@ -33,7 +33,7 @@
input = pInput;
}
-public ArchiveEntry getNextEntry() throws IOException {
+public ArArchiveEntry getNextArEntry() throws IOException {
if (offset == 0) {
final byte[] expected = !arch\n.getBytes();
@@ -90,6 +90,10 @@
}
+public ArchiveEntry getNextEntry() throws IOException {
+return getNextArEntry();
+}
+
public int read() throws IOException {
final int ret = input.read();
offset++;
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java?rev=743259r1=743258r2=743259view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
Wed Feb 11 07:44:00 2009
@@ -435,11 +435,7 @@
}
public ArchiveEntry getNextEntry() throws IOException {
-CpioArchiveEntry entry = this.getNextCPIOEntry();
-if(entry == null) {
-return null;
-}
-return (ArchiveEntry)entry;
+return getNextCPIOEntry();
}
public static boolean matches(byte[] signature, int length) {
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java?rev=743259r1=743258r2=743259view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/jar/JarArchiveInputStream.java
Wed Feb 11 07:44:00 2009
@@ -31,13 +31,13 @@
super(inputStream);
}
+public JarArchiveEntry getNextJarEntry() throws IOException {
+ZipArchiveEntry entry = getNextZipEntry();
+return entry == null ? null : new JarArchiveEntry(entry);
+}
+
public ArchiveEntry getNextEntry() throws IOException {
-ZipArchiveEntry entry = (ZipArchiveEntry)super.getNextEntry();
-if(entry == null) {
-return null;
-} else {
-return (ArchiveEntry)new JarArchiveEntry(entry);
-}
+return getNextJarEntry();
}
public static boolean matches(byte[] signature, int length ) {
Modified:
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java?rev=743259r1=743258r2=743259view=diff
==
---
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
(original)
+++
commons/sandbox/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveInputStream.java
Wed Feb 11 07:44:00 2009
@@
