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 2014/08/31 21:27:54 UTC
svn commit: r920865 [16/45] - in
/websites/production/commons/content/proper/commons-compress: ./ apidocs/
apidocs/org/apache/commons/compress/archivers/
apidocs/org/apache/commons/compress/archivers/ar/
apidocs/org/apache/commons/compress/archivers/ar...
Modified: websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/CompressorStreamFactory.html
==============================================================================
--- websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/CompressorStreamFactory.html (original)
+++ websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/CompressorStreamFactory.html Sun Aug 31 19:27:46 2014
@@ -182,21 +182,21 @@
<span class="sourceLineNo">174</span> return new GzipCompressorInputStream(in, decompressConcatenated);<a name="line.174"></a>
<span class="sourceLineNo">175</span> }<a name="line.175"></a>
<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> if (XZUtils.isXZCompressionAvailable() &&<a name="line.177"></a>
-<span class="sourceLineNo">178</span> XZCompressorInputStream.matches(signature, signatureLength)) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return new XZCompressorInputStream(in, decompressConcatenated);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> if (Pack200CompressorInputStream.matches(signature, signatureLength)) {<a name="line.182"></a>
-<span class="sourceLineNo">183</span> return new Pack200CompressorInputStream(in);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> if (FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> return new FramedSnappyCompressorInputStream(in);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> }<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> if (ZCompressorInputStream.matches(signature, signatureLength)) {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> return new ZCompressorInputStream(in);<a name="line.191"></a>
+<span class="sourceLineNo">177</span> if (Pack200CompressorInputStream.matches(signature, signatureLength)) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> return new Pack200CompressorInputStream(in);<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> if (FramedSnappyCompressorInputStream.matches(signature, signatureLength)) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> return new FramedSnappyCompressorInputStream(in);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> if (ZCompressorInputStream.matches(signature, signatureLength)) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> return new ZCompressorInputStream(in);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span> if (XZUtils.matches(signature, signatureLength) &&<a name="line.189"></a>
+<span class="sourceLineNo">190</span> XZUtils.isXZCompressionAvailable()) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> return new XZCompressorInputStream(in, decompressConcatenated);<a name="line.191"></a>
<span class="sourceLineNo">192</span> }<a name="line.192"></a>
<span class="sourceLineNo">193</span><a name="line.193"></a>
<span class="sourceLineNo">194</span> } catch (IOException e) {<a name="line.194"></a>
Modified: websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.html
==============================================================================
--- websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.html (original)
+++ websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.html Sun Aug 31 19:27:46 2014
@@ -111,7 +111,7 @@
<span class="sourceLineNo">103</span> * @throws IOException<a name="line.103"></a>
<span class="sourceLineNo">104</span> * if the stream content is malformed or an I/O error occurs.<a name="line.104"></a>
<span class="sourceLineNo">105</span> * @throws NullPointerException<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * if <tt>in == null</tt><a name="line.106"></a>
+<span class="sourceLineNo">106</span> * if {@code in == null}<a name="line.106"></a>
<span class="sourceLineNo">107</span> */<a name="line.107"></a>
<span class="sourceLineNo">108</span> public BZip2CompressorInputStream(final InputStream in) throws IOException {<a name="line.108"></a>
<span class="sourceLineNo">109</span> this(in, false);<a name="line.109"></a>
@@ -131,7 +131,7 @@
<span class="sourceLineNo">123</span> * @throws IOException<a name="line.123"></a>
<span class="sourceLineNo">124</span> * if the stream content is malformed or an I/O error occurs.<a name="line.124"></a>
<span class="sourceLineNo">125</span> * @throws NullPointerException<a name="line.125"></a>
-<span class="sourceLineNo">126</span> * if <tt>in == null</tt><a name="line.126"></a>
+<span class="sourceLineNo">126</span> * if {@code in == null}<a name="line.126"></a>
<span class="sourceLineNo">127</span> */<a name="line.127"></a>
<span class="sourceLineNo">128</span> public BZip2CompressorInputStream(final InputStream in, final boolean decompressConcatenated) throws IOException {<a name="line.128"></a>
<span class="sourceLineNo">129</span> this.in = in;<a name="line.129"></a>
Modified: websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.html
==============================================================================
--- websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.html (original)
+++ websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/bzip2/BZip2CompressorOutputStream.html Sun Aug 31 19:27:46 2014
@@ -37,7 +37,7 @@
<span class="sourceLineNo">029</span> * <p><a name="line.29"></a>
<span class="sourceLineNo">030</span> * The compression requires large amounts of memory. Thus you should call the<a name="line.30"></a>
<span class="sourceLineNo">031</span> * {@link #close() close()} method as soon as possible, to force<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * <tt>BZip2CompressorOutputStream</tt> to release the allocated memory.<a name="line.32"></a>
+<span class="sourceLineNo">032</span> * {@code BZip2CompressorOutputStream} to release the allocated memory.<a name="line.32"></a>
<span class="sourceLineNo">033</span> * </p><a name="line.33"></a>
<span class="sourceLineNo">034</span> *<a name="line.34"></a>
<span class="sourceLineNo">035</span> * <p> You can shrink the amount of allocated memory and maybe raise<a name="line.35"></a>
@@ -117,7 +117,7 @@
<span class="sourceLineNo">109</span> * </table><a name="line.109"></a>
<span class="sourceLineNo">110</span> *<a name="line.110"></a>
<span class="sourceLineNo">111</span> * <p><a name="line.111"></a>
-<span class="sourceLineNo">112</span> * For decompression <tt>BZip2CompressorInputStream</tt> allocates less memory if the<a name="line.112"></a>
+<span class="sourceLineNo">112</span> * For decompression {@code BZip2CompressorInputStream} allocates less memory if the<a name="line.112"></a>
<span class="sourceLineNo">113</span> * bzipped input is smaller than one block.<a name="line.113"></a>
<span class="sourceLineNo">114</span> * </p><a name="line.114"></a>
<span class="sourceLineNo">115</span> *<a name="line.115"></a>
@@ -134,12 +134,12 @@
<span class="sourceLineNo">126</span> implements BZip2Constants {<a name="line.126"></a>
<span class="sourceLineNo">127</span><a name="line.127"></a>
<span class="sourceLineNo">128</span> /**<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * The minimum supported blocksize <tt> == 1</tt>.<a name="line.129"></a>
+<span class="sourceLineNo">129</span> * The minimum supported blocksize {@code == 1}.<a name="line.129"></a>
<span class="sourceLineNo">130</span> */<a name="line.130"></a>
<span class="sourceLineNo">131</span> public static final int MIN_BLOCKSIZE = 1;<a name="line.131"></a>
<span class="sourceLineNo">132</span><a name="line.132"></a>
<span class="sourceLineNo">133</span> /**<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * The maximum supported blocksize <tt> == 9</tt>.<a name="line.134"></a>
+<span class="sourceLineNo">134</span> * The maximum supported blocksize {@code == 9}.<a name="line.134"></a>
<span class="sourceLineNo">135</span> */<a name="line.135"></a>
<span class="sourceLineNo">136</span> public static final int MAX_BLOCKSIZE = 9;<a name="line.136"></a>
<span class="sourceLineNo">137</span><a name="line.137"></a>
@@ -336,12 +336,12 @@
<span class="sourceLineNo">328</span> *<a name="line.328"></a>
<span class="sourceLineNo">329</span> * @return The blocksize, between {@link #MIN_BLOCKSIZE} and<a name="line.329"></a>
<span class="sourceLineNo">330</span> * {@link #MAX_BLOCKSIZE} both inclusive. For a negative<a name="line.330"></a>
-<span class="sourceLineNo">331</span> * <tt>inputLength</tt> this method returns <tt>MAX_BLOCKSIZE</tt><a name="line.331"></a>
+<span class="sourceLineNo">331</span> * {@code inputLength} this method returns {@code MAX_BLOCKSIZE}<a name="line.331"></a>
<span class="sourceLineNo">332</span> * always.<a name="line.332"></a>
<span class="sourceLineNo">333</span> *<a name="line.333"></a>
<span class="sourceLineNo">334</span> * @param inputLength<a name="line.334"></a>
<span class="sourceLineNo">335</span> * The length of the data which will be compressed by<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * <tt>BZip2CompressorOutputStream</tt>.<a name="line.336"></a>
+<span class="sourceLineNo">336</span> * {@code BZip2CompressorOutputStream}.<a name="line.336"></a>
<span class="sourceLineNo">337</span> */<a name="line.337"></a>
<span class="sourceLineNo">338</span> public static int chooseBlockSize(long inputLength) {<a name="line.338"></a>
<span class="sourceLineNo">339</span> return (inputLength > 0) ? (int) Math<a name="line.339"></a>
@@ -349,7 +349,7 @@
<span class="sourceLineNo">341</span> }<a name="line.341"></a>
<span class="sourceLineNo">342</span><a name="line.342"></a>
<span class="sourceLineNo">343</span> /**<a name="line.343"></a>
-<span class="sourceLineNo">344</span> * Constructs a new <tt>BZip2CompressorOutputStream</tt> with a blocksize of 900k.<a name="line.344"></a>
+<span class="sourceLineNo">344</span> * Constructs a new {@code BZip2CompressorOutputStream} with a blocksize of 900k.<a name="line.344"></a>
<span class="sourceLineNo">345</span> *<a name="line.345"></a>
<span class="sourceLineNo">346</span> * @param out <a name="line.346"></a>
<span class="sourceLineNo">347</span> * the destination stream.<a name="line.347"></a>
@@ -365,7 +365,7 @@
<span class="sourceLineNo">357</span> }<a name="line.357"></a>
<span class="sourceLineNo">358</span><a name="line.358"></a>
<span class="sourceLineNo">359</span> /**<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * Constructs a new <tt>BZip2CompressorOutputStream</tt> with specified blocksize.<a name="line.360"></a>
+<span class="sourceLineNo">360</span> * Constructs a new {@code BZip2CompressorOutputStream} with specified blocksize.<a name="line.360"></a>
<span class="sourceLineNo">361</span> *<a name="line.361"></a>
<span class="sourceLineNo">362</span> * @param out<a name="line.362"></a>
<span class="sourceLineNo">363</span> * the destination stream.<a name="line.363"></a>
Modified: websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.html
==============================================================================
--- websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.html (original)
+++ websites/production/commons/content/proper/commons-compress/apidocs/src-html/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.html Sun Aug 31 19:27:46 2014
@@ -82,325 +82,315 @@
<span class="sourceLineNo">074</span> // CRC32 from uncompressed data<a name="line.74"></a>
<span class="sourceLineNo">075</span> private final CRC32 crc = new CRC32();<a name="line.75"></a>
<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> private int memberSize;<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> // True once everything has been decompressed<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private boolean endReached = false;<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> // used in no-arg read method<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private final byte[] oneByte = new byte[1];<a name="line.83"></a>
+<span class="sourceLineNo">077</span> // True once everything has been decompressed<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private boolean endReached = false;<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> // used in no-arg read method<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private final byte[] oneByte = new byte[1];<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> private final GzipParameters parameters = new GzipParameters();<a name="line.83"></a>
<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> private final GzipParameters parameters = new GzipParameters();<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * Constructs a new input stream that decompresses gzip-compressed data<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * from the specified input stream.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * <p><a name="line.90"></a>
-<span class="sourceLineNo">091</span> * This is equivalent to<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * <code>GzipCompressorInputStream(inputStream, false)</code> and thus<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * will not decompress concatenated .gz files.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> *<a name="line.94"></a>
-<span class="sourceLineNo">095</span> * @param inputStream the InputStream from which this object should<a name="line.95"></a>
-<span class="sourceLineNo">096</span> * be created of<a name="line.96"></a>
-<span class="sourceLineNo">097</span> *<a name="line.97"></a>
-<span class="sourceLineNo">098</span> * @throws IOException if the stream could not be created<a name="line.98"></a>
-<span class="sourceLineNo">099</span> */<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public GzipCompressorInputStream(InputStream inputStream)<a name="line.100"></a>
-<span class="sourceLineNo">101</span> throws IOException {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> this(inputStream, false);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> /**<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * Constructs a new input stream that decompresses gzip-compressed data<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * from the specified input stream.<a name="line.107"></a>
-<span class="sourceLineNo">108</span> * <p><a name="line.108"></a>
-<span class="sourceLineNo">109</span> * If <code>decompressConcatenated</code> is {@code false}:<a name="line.109"></a>
-<span class="sourceLineNo">110</span> * This decompressor might read more input than it will actually use.<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * If <code>inputStream</code> supports <code>mark</code> and<a name="line.111"></a>
-<span class="sourceLineNo">112</span> * <code>reset</code>, then the input position will be adjusted<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * so that it is right after the last byte of the compressed stream.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> * If <code>mark</code> isn't supported, the input position will be<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * undefined.<a name="line.115"></a>
-<span class="sourceLineNo">116</span> *<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @param inputStream the InputStream from which this object should<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * be created of<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * @param decompressConcatenated<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * if true, decompress until the end of the input;<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * if false, stop after the first .gz member<a name="line.121"></a>
-<span class="sourceLineNo">122</span> *<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @throws IOException if the stream could not be created<a name="line.123"></a>
-<span class="sourceLineNo">124</span> */<a name="line.124"></a>
-<span class="sourceLineNo">125</span> public GzipCompressorInputStream(InputStream inputStream,<a name="line.125"></a>
-<span class="sourceLineNo">126</span> boolean decompressConcatenated)<a name="line.126"></a>
-<span class="sourceLineNo">127</span> throws IOException {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // Mark support is strictly needed for concatenated files only,<a name="line.128"></a>
-<span class="sourceLineNo">129</span> // but it's simpler if it is always available.<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (inputStream.markSupported()) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> in = inputStream;<a name="line.131"></a>
-<span class="sourceLineNo">132</span> } else {<a name="line.132"></a>
-<span class="sourceLineNo">133</span> in = new BufferedInputStream(inputStream);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> }<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> this.decompressConcatenated = decompressConcatenated;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> init(true);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> /**<a name="line.140"></a>
-<span class="sourceLineNo">141</span> * Provides the stream's meta data - may change with each stream<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * when decompressing concatenated streams.<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * @return the stream's meta data<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * @since 1.8<a name="line.144"></a>
-<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> public GzipParameters getMetaData() {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> return parameters;<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> private boolean init(boolean isFirstMember) throws IOException {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> assert isFirstMember || decompressConcatenated;<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span> // Check the magic bytes without a possibility of EOFException.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> int magic0 = in.read();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> int magic1 = in.read();<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> // If end of input was reached after decompressing at least<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // one .gz member, we have reached the end of the file successfully.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> if (magic0 == -1 && !isFirstMember) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return false;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> if (magic0 != 31 || magic1 != 139) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> throw new IOException(isFirstMember<a name="line.164"></a>
-<span class="sourceLineNo">165</span> ? "Input is not in the .gz format"<a name="line.165"></a>
-<span class="sourceLineNo">166</span> : "Garbage after a valid .gz stream");<a name="line.166"></a>
-<span class="sourceLineNo">167</span> }<a name="line.167"></a>
-<span class="sourceLineNo">168</span><a name="line.168"></a>
-<span class="sourceLineNo">169</span> // Parsing the rest of the header may throw EOFException.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> DataInputStream inData = new DataInputStream(in);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> int method = inData.readUnsignedByte();<a name="line.171"></a>
-<span class="sourceLineNo">172</span> if (method != Deflater.DEFLATED) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> throw new IOException("Unsupported compression method "<a name="line.173"></a>
-<span class="sourceLineNo">174</span> + method + " in the .gz header");<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> int flg = inData.readUnsignedByte();<a name="line.177"></a>
-<span class="sourceLineNo">178</span> if ((flg & FRESERVED) != 0) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> throw new IOException(<a name="line.179"></a>
-<span class="sourceLineNo">180</span> "Reserved flags are set in the .gz header");<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> parameters.setModificationTime(readLittleEndianInt(inData) * 1000);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> switch (inData.readUnsignedByte()) { // extra flags<a name="line.184"></a>
-<span class="sourceLineNo">185</span> case 2:<a name="line.185"></a>
-<span class="sourceLineNo">186</span> parameters.setCompressionLevel(Deflater.BEST_COMPRESSION);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> break;<a name="line.187"></a>
-<span class="sourceLineNo">188</span> case 4:<a name="line.188"></a>
-<span class="sourceLineNo">189</span> parameters.setCompressionLevel(Deflater.BEST_SPEED);<a name="line.189"></a>
-<span class="sourceLineNo">190</span> break;<a name="line.190"></a>
-<span class="sourceLineNo">191</span> default:<a name="line.191"></a>
-<span class="sourceLineNo">192</span> // ignored for now<a name="line.192"></a>
-<span class="sourceLineNo">193</span> break;<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> parameters.setOperatingSystem(inData.readUnsignedByte());<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> // Extra field, ignored<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if ((flg & FEXTRA) != 0) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> int xlen = inData.readUnsignedByte();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> xlen |= inData.readUnsignedByte() << 8;<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span> // This isn't as efficient as calling in.skip would be,<a name="line.202"></a>
-<span class="sourceLineNo">203</span> // but it's lazier to handle unexpected end of input this way.<a name="line.203"></a>
-<span class="sourceLineNo">204</span> // Most files don't have an extra field anyway.<a name="line.204"></a>
-<span class="sourceLineNo">205</span> while (xlen-- > 0) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> inData.readUnsignedByte();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> // Original file name<a name="line.210"></a>
-<span class="sourceLineNo">211</span> if ((flg & FNAME) != 0) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> parameters.setFilename(new String(readToNull(inData),<a name="line.212"></a>
-<span class="sourceLineNo">213</span> CharsetNames.ISO_8859_1));<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> // Comment<a name="line.216"></a>
-<span class="sourceLineNo">217</span> if ((flg & FCOMMENT) != 0) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> parameters.setComment(new String(readToNull(inData),<a name="line.218"></a>
-<span class="sourceLineNo">219</span> CharsetNames.ISO_8859_1));<a name="line.219"></a>
-<span class="sourceLineNo">220</span> }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span> // Header "CRC16" which is actually a truncated CRC32 (which isn't<a name="line.222"></a>
-<span class="sourceLineNo">223</span> // as good as real CRC16). I don't know if any encoder implementation<a name="line.223"></a>
-<span class="sourceLineNo">224</span> // sets this, so it's not worth trying to verify it. GNU gzip 1.4<a name="line.224"></a>
-<span class="sourceLineNo">225</span> // doesn't support this field, but zlib seems to be able to at least<a name="line.225"></a>
-<span class="sourceLineNo">226</span> // skip over it.<a name="line.226"></a>
-<span class="sourceLineNo">227</span> if ((flg & FHCRC) != 0) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span> inData.readShort();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> // Reset<a name="line.231"></a>
-<span class="sourceLineNo">232</span> inf.reset();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> crc.reset();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> memberSize = 0;<a name="line.234"></a>
+<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * Constructs a new input stream that decompresses gzip-compressed data<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * from the specified input stream.<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <p><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * This is equivalent to<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <code>GzipCompressorInputStream(inputStream, false)</code> and thus<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * will not decompress concatenated .gz files.<a name="line.91"></a>
+<span class="sourceLineNo">092</span> *<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * @param inputStream the InputStream from which this object should<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * be created of<a name="line.94"></a>
+<span class="sourceLineNo">095</span> *<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @throws IOException if the stream could not be created<a name="line.96"></a>
+<span class="sourceLineNo">097</span> */<a name="line.97"></a>
+<span class="sourceLineNo">098</span> public GzipCompressorInputStream(InputStream inputStream)<a name="line.98"></a>
+<span class="sourceLineNo">099</span> throws IOException {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> this(inputStream, false);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span> * Constructs a new input stream that decompresses gzip-compressed data<a name="line.104"></a>
+<span class="sourceLineNo">105</span> * from the specified input stream.<a name="line.105"></a>
+<span class="sourceLineNo">106</span> * <p><a name="line.106"></a>
+<span class="sourceLineNo">107</span> * If <code>decompressConcatenated</code> is {@code false}:<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * This decompressor might read more input than it will actually use.<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * If <code>inputStream</code> supports <code>mark</code> and<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * <code>reset</code>, then the input position will be adjusted<a name="line.110"></a>
+<span class="sourceLineNo">111</span> * so that it is right after the last byte of the compressed stream.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> * If <code>mark</code> isn't supported, the input position will be<a name="line.112"></a>
+<span class="sourceLineNo">113</span> * undefined.<a name="line.113"></a>
+<span class="sourceLineNo">114</span> *<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @param inputStream the InputStream from which this object should<a name="line.115"></a>
+<span class="sourceLineNo">116</span> * be created of<a name="line.116"></a>
+<span class="sourceLineNo">117</span> * @param decompressConcatenated<a name="line.117"></a>
+<span class="sourceLineNo">118</span> * if true, decompress until the end of the input;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * if false, stop after the first .gz member<a name="line.119"></a>
+<span class="sourceLineNo">120</span> *<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @throws IOException if the stream could not be created<a name="line.121"></a>
+<span class="sourceLineNo">122</span> */<a name="line.122"></a>
+<span class="sourceLineNo">123</span> public GzipCompressorInputStream(InputStream inputStream,<a name="line.123"></a>
+<span class="sourceLineNo">124</span> boolean decompressConcatenated)<a name="line.124"></a>
+<span class="sourceLineNo">125</span> throws IOException {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> // Mark support is strictly needed for concatenated files only,<a name="line.126"></a>
+<span class="sourceLineNo">127</span> // but it's simpler if it is always available.<a name="line.127"></a>
+<span class="sourceLineNo">128</span> if (inputStream.markSupported()) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> in = inputStream;<a name="line.129"></a>
+<span class="sourceLineNo">130</span> } else {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> in = new BufferedInputStream(inputStream);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> }<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> this.decompressConcatenated = decompressConcatenated;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> init(true);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> /**<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * Provides the stream's meta data - may change with each stream<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * when decompressing concatenated streams.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> * @return the stream's meta data<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * @since 1.8<a name="line.142"></a>
+<span class="sourceLineNo">143</span> */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> public GzipParameters getMetaData() {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> return parameters;<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span> private boolean init(boolean isFirstMember) throws IOException {<a name="line.148"></a>
+<span class="sourceLineNo">149</span> assert isFirstMember || decompressConcatenated;<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> // Check the magic bytes without a possibility of EOFException.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> int magic0 = in.read();<a name="line.152"></a>
+<span class="sourceLineNo">153</span> int magic1 = in.read();<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> // If end of input was reached after decompressing at least<a name="line.155"></a>
+<span class="sourceLineNo">156</span> // one .gz member, we have reached the end of the file successfully.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> if (magic0 == -1 && !isFirstMember) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return false;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span> if (magic0 != 31 || magic1 != 139) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> throw new IOException(isFirstMember<a name="line.162"></a>
+<span class="sourceLineNo">163</span> ? "Input is not in the .gz format"<a name="line.163"></a>
+<span class="sourceLineNo">164</span> : "Garbage after a valid .gz stream");<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> // Parsing the rest of the header may throw EOFException.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> DataInputStream inData = new DataInputStream(in);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> int method = inData.readUnsignedByte();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> if (method != Deflater.DEFLATED) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> throw new IOException("Unsupported compression method "<a name="line.171"></a>
+<span class="sourceLineNo">172</span> + method + " in the .gz header");<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> int flg = inData.readUnsignedByte();<a name="line.175"></a>
+<span class="sourceLineNo">176</span> if ((flg & FRESERVED) != 0) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> throw new IOException(<a name="line.177"></a>
+<span class="sourceLineNo">178</span> "Reserved flags are set in the .gz header");<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> parameters.setModificationTime(readLittleEndianInt(inData) * 1000);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> switch (inData.readUnsignedByte()) { // extra flags<a name="line.182"></a>
+<span class="sourceLineNo">183</span> case 2:<a name="line.183"></a>
+<span class="sourceLineNo">184</span> parameters.setCompressionLevel(Deflater.BEST_COMPRESSION);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> break;<a name="line.185"></a>
+<span class="sourceLineNo">186</span> case 4:<a name="line.186"></a>
+<span class="sourceLineNo">187</span> parameters.setCompressionLevel(Deflater.BEST_SPEED);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> break;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> default:<a name="line.189"></a>
+<span class="sourceLineNo">190</span> // ignored for now<a name="line.190"></a>
+<span class="sourceLineNo">191</span> break;<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span> parameters.setOperatingSystem(inData.readUnsignedByte());<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span> // Extra field, ignored<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if ((flg & FEXTRA) != 0) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> int xlen = inData.readUnsignedByte();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> xlen |= inData.readUnsignedByte() << 8;<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> // This isn't as efficient as calling in.skip would be,<a name="line.200"></a>
+<span class="sourceLineNo">201</span> // but it's lazier to handle unexpected end of input this way.<a name="line.201"></a>
+<span class="sourceLineNo">202</span> // Most files don't have an extra field anyway.<a name="line.202"></a>
+<span class="sourceLineNo">203</span> while (xlen-- > 0) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> inData.readUnsignedByte();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> // Original file name<a name="line.208"></a>
+<span class="sourceLineNo">209</span> if ((flg & FNAME) != 0) {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> parameters.setFilename(new String(readToNull(inData),<a name="line.210"></a>
+<span class="sourceLineNo">211</span> CharsetNames.ISO_8859_1));<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> // Comment<a name="line.214"></a>
+<span class="sourceLineNo">215</span> if ((flg & FCOMMENT) != 0) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> parameters.setComment(new String(readToNull(inData),<a name="line.216"></a>
+<span class="sourceLineNo">217</span> CharsetNames.ISO_8859_1));<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> // Header "CRC16" which is actually a truncated CRC32 (which isn't<a name="line.220"></a>
+<span class="sourceLineNo">221</span> // as good as real CRC16). I don't know if any encoder implementation<a name="line.221"></a>
+<span class="sourceLineNo">222</span> // sets this, so it's not worth trying to verify it. GNU gzip 1.4<a name="line.222"></a>
+<span class="sourceLineNo">223</span> // doesn't support this field, but zlib seems to be able to at least<a name="line.223"></a>
+<span class="sourceLineNo">224</span> // skip over it.<a name="line.224"></a>
+<span class="sourceLineNo">225</span> if ((flg & FHCRC) != 0) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> inData.readShort();<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span> // Reset<a name="line.229"></a>
+<span class="sourceLineNo">230</span> inf.reset();<a name="line.230"></a>
+<span class="sourceLineNo">231</span> crc.reset();<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span> return true;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> return true;<a name="line.236"></a>
-<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> private byte[] readToNull(DataInputStream inData) throws IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> ByteArrayOutputStream bos = new ByteArrayOutputStream();<a name="line.240"></a>
-<span class="sourceLineNo">241</span> int b = 0;<a name="line.241"></a>
-<span class="sourceLineNo">242</span> while ((b = inData.readUnsignedByte()) != 0x00) { // NOPMD<a name="line.242"></a>
-<span class="sourceLineNo">243</span> bos.write(b);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span> return bos.toByteArray();<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> private int readLittleEndianInt(DataInputStream inData) throws IOException {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> return inData.readUnsignedByte()<a name="line.249"></a>
-<span class="sourceLineNo">250</span> | (inData.readUnsignedByte() << 8)<a name="line.250"></a>
-<span class="sourceLineNo">251</span> | (inData.readUnsignedByte() << 16)<a name="line.251"></a>
-<span class="sourceLineNo">252</span> | (inData.readUnsignedByte() << 24);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> @Override<a name="line.255"></a>
-<span class="sourceLineNo">256</span> public int read() throws IOException {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return read(oneByte, 0, 1) == -1 ? -1 : oneByte[0] & 0xFF;<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> /**<a name="line.260"></a>
-<span class="sourceLineNo">261</span> * {@inheritDoc}<a name="line.261"></a>
-<span class="sourceLineNo">262</span> *<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * @since 1.1<a name="line.263"></a>
-<span class="sourceLineNo">264</span> */<a name="line.264"></a>
-<span class="sourceLineNo">265</span> @Override<a name="line.265"></a>
-<span class="sourceLineNo">266</span> public int read(byte[] b, int off, int len) throws IOException {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> if (endReached) {<a name="line.267"></a>
-<span class="sourceLineNo">268</span> return -1;<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> int size = 0;<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> while (len > 0) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (inf.needsInput()) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> // Remember the current position because we may need to<a name="line.275"></a>
-<span class="sourceLineNo">276</span> // rewind after reading too much input.<a name="line.276"></a>
-<span class="sourceLineNo">277</span> in.mark(buf.length);<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> bufUsed = in.read(buf);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (bufUsed == -1) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> throw new EOFException();<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">236</span> private byte[] readToNull(DataInputStream inData) throws IOException {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> ByteArrayOutputStream bos = new ByteArrayOutputStream();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> int b = 0;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> while ((b = inData.readUnsignedByte()) != 0x00) { // NOPMD<a name="line.239"></a>
+<span class="sourceLineNo">240</span> bos.write(b);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> }<a name="line.241"></a>
+<span class="sourceLineNo">242</span> return bos.toByteArray();<a name="line.242"></a>
+<span class="sourceLineNo">243</span> }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> private long readLittleEndianInt(DataInputStream inData) throws IOException {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return inData.readUnsignedByte()<a name="line.246"></a>
+<span class="sourceLineNo">247</span> | (inData.readUnsignedByte() << 8)<a name="line.247"></a>
+<span class="sourceLineNo">248</span> | (inData.readUnsignedByte() << 16)<a name="line.248"></a>
+<span class="sourceLineNo">249</span> | (((long) inData.readUnsignedByte()) << 24);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> @Override<a name="line.252"></a>
+<span class="sourceLineNo">253</span> public int read() throws IOException {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> return read(oneByte, 0, 1) == -1 ? -1 : oneByte[0] & 0xFF;<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * {@inheritDoc}<a name="line.258"></a>
+<span class="sourceLineNo">259</span> *<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * @since 1.1<a name="line.260"></a>
+<span class="sourceLineNo">261</span> */<a name="line.261"></a>
+<span class="sourceLineNo">262</span> @Override<a name="line.262"></a>
+<span class="sourceLineNo">263</span> public int read(byte[] b, int off, int len) throws IOException {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if (endReached) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> return -1;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> int size = 0;<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> while (len > 0) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span> if (inf.needsInput()) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> // Remember the current position because we may need to<a name="line.272"></a>
+<span class="sourceLineNo">273</span> // rewind after reading too much input.<a name="line.273"></a>
+<span class="sourceLineNo">274</span> in.mark(buf.length);<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span> bufUsed = in.read(buf);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> if (bufUsed == -1) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> throw new EOFException();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> }<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> inf.setInput(buf, 0, bufUsed);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> inf.setInput(buf, 0, bufUsed);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> int ret;<a name="line.287"></a>
-<span class="sourceLineNo">288</span> try {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> ret = inf.inflate(b, off, len);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> } catch (DataFormatException e) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> throw new IOException("Gzip-compressed data is corrupt");<a name="line.291"></a>
-<span class="sourceLineNo">292</span> }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> crc.update(b, off, ret);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> memberSize += ret;<a name="line.295"></a>
-<span class="sourceLineNo">296</span> off += ret;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> len -= ret;<a name="line.297"></a>
-<span class="sourceLineNo">298</span> size += ret;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> count(ret);<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> if (inf.finished()) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> // We may have read too many bytes. Rewind the read<a name="line.302"></a>
-<span class="sourceLineNo">303</span> // position to match the actual amount used.<a name="line.303"></a>
-<span class="sourceLineNo">304</span> //<a name="line.304"></a>
-<span class="sourceLineNo">305</span> // NOTE: The "if" is there just in case. Since we used<a name="line.305"></a>
-<span class="sourceLineNo">306</span> // in.mark earler, it should always skip enough.<a name="line.306"></a>
-<span class="sourceLineNo">307</span> in.reset();<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span> int skipAmount = bufUsed - inf.getRemaining();<a name="line.309"></a>
-<span class="sourceLineNo">310</span> if (in.skip(skipAmount) != skipAmount) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> throw new IOException();<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">284</span> int ret;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> try {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> ret = inf.inflate(b, off, len);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> } catch (DataFormatException e) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> throw new IOException("Gzip-compressed data is corrupt");<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> crc.update(b, off, ret);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> off += ret;<a name="line.292"></a>
+<span class="sourceLineNo">293</span> len -= ret;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> size += ret;<a name="line.294"></a>
+<span class="sourceLineNo">295</span> count(ret);<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (inf.finished()) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> // We may have read too many bytes. Rewind the read<a name="line.298"></a>
+<span class="sourceLineNo">299</span> // position to match the actual amount used.<a name="line.299"></a>
+<span class="sourceLineNo">300</span> //<a name="line.300"></a>
+<span class="sourceLineNo">301</span> // NOTE: The "if" is there just in case. Since we used<a name="line.301"></a>
+<span class="sourceLineNo">302</span> // in.mark earler, it should always skip enough.<a name="line.302"></a>
+<span class="sourceLineNo">303</span> in.reset();<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> int skipAmount = bufUsed - inf.getRemaining();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> if (in.skip(skipAmount) != skipAmount) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> throw new IOException();<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span> bufUsed = 0;<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> DataInputStream inData = new DataInputStream(in);<a name="line.312"></a>
<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> bufUsed = 0;<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> DataInputStream inData = new DataInputStream(in);<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> // CRC32<a name="line.318"></a>
-<span class="sourceLineNo">319</span> long crcStored = 0;<a name="line.319"></a>
-<span class="sourceLineNo">320</span> for (int i = 0; i < 4; ++i) {<a name="line.320"></a>
-<span class="sourceLineNo">321</span> crcStored |= (long)inData.readUnsignedByte() << (i * 8);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> if (crcStored != crc.getValue()) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> throw new IOException("Gzip-compressed data is corrupt "<a name="line.325"></a>
-<span class="sourceLineNo">326</span> + "(CRC32 error)");<a name="line.326"></a>
-<span class="sourceLineNo">327</span> }<a name="line.327"></a>
-<span class="sourceLineNo">328</span><a name="line.328"></a>
-<span class="sourceLineNo">329</span> // Uncompressed size modulo 2^32 (ISIZE in the spec)<a name="line.329"></a>
-<span class="sourceLineNo">330</span> int isize = 0;<a name="line.330"></a>
-<span class="sourceLineNo">331</span> for (int i = 0; i < 4; ++i) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> isize |= inData.readUnsignedByte() << (i * 8);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span> if (isize != memberSize) {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> throw new IOException("Gzip-compressed data is corrupt"<a name="line.336"></a>
-<span class="sourceLineNo">337</span> + "(uncompressed size mismatch)");<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">314</span> // CRC32<a name="line.314"></a>
+<span class="sourceLineNo">315</span> long crcStored = readLittleEndianInt(inData);<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> if (crcStored != crc.getValue()) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> throw new IOException("Gzip-compressed data is corrupt "<a name="line.318"></a>
+<span class="sourceLineNo">319</span> + "(CRC32 error)");<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> // Uncompressed size modulo 2^32 (ISIZE in the spec)<a name="line.322"></a>
+<span class="sourceLineNo">323</span> long isize = readLittleEndianInt(inData);<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> if (isize != (inf.getBytesWritten() & 0xffffffffl)) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> throw new IOException("Gzip-compressed data is corrupt"<a name="line.326"></a>
+<span class="sourceLineNo">327</span> + "(uncompressed size mismatch)");<a name="line.327"></a>
+<span class="sourceLineNo">328</span> }<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span> // See if this is the end of the file.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> if (!decompressConcatenated || !init(false)) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> inf.end();<a name="line.332"></a>
+<span class="sourceLineNo">333</span> inf = null;<a name="line.333"></a>
+<span class="sourceLineNo">334</span> endReached = true;<a name="line.334"></a>
+<span class="sourceLineNo">335</span> return size == 0 ? -1 : size;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> // See if this is the end of the file.<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (!decompressConcatenated || !init(false)) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> inf.end();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> inf = null;<a name="line.343"></a>
-<span class="sourceLineNo">344</span> endReached = true;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> return size == 0 ? -1 : size;<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span><a name="line.349"></a>
-<span class="sourceLineNo">350</span> return size;<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> /**<a name="line.353"></a>
-<span class="sourceLineNo">354</span> * Checks if the signature matches what is expected for a .gz file.<a name="line.354"></a>
-<span class="sourceLineNo">355</span> *<a name="line.355"></a>
-<span class="sourceLineNo">356</span> * @param signature the bytes to check<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * @param length the number of bytes to check<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * @return true if this is a .gz stream, false otherwise<a name="line.358"></a>
-<span class="sourceLineNo">359</span> *<a name="line.359"></a>
-<span class="sourceLineNo">360</span> * @since 1.1<a name="line.360"></a>
-<span class="sourceLineNo">361</span> */<a name="line.361"></a>
-<span class="sourceLineNo">362</span> public static boolean matches(byte[] signature, int length) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span> if (length < 2) {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return false;<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> if (signature[0] != 31) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span> return false;<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> if (signature[1] != -117) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return false;<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> return true;<a name="line.376"></a>
-<span class="sourceLineNo">377</span> }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span> /**<a name="line.379"></a>
-<span class="sourceLineNo">380</span> * Closes the input stream (unless it is System.in).<a name="line.380"></a>
-<span class="sourceLineNo">381</span> *<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * @since 1.2<a name="line.382"></a>
-<span class="sourceLineNo">383</span> */<a name="line.383"></a>
-<span class="sourceLineNo">384</span> @Override<a name="line.384"></a>
-<span class="sourceLineNo">385</span> public void close() throws IOException {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (inf != null) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> inf.end();<a name="line.387"></a>
-<span class="sourceLineNo">388</span> inf = null;<a name="line.388"></a>
-<span class="sourceLineNo">389</span> }<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span> if (this.in != System.in) {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> this.in.close();<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span> }<a name="line.394"></a>
-<span class="sourceLineNo">395</span>}<a name="line.395"></a>
+<span class="sourceLineNo">340</span> return size;<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> /**<a name="line.343"></a>
+<span class="sourceLineNo">344</span> * Checks if the signature matches what is expected for a .gz file.<a name="line.344"></a>
+<span class="sourceLineNo">345</span> *<a name="line.345"></a>
+<span class="sourceLineNo">346</span> * @param signature the bytes to check<a name="line.346"></a>
+<span class="sourceLineNo">347</span> * @param length the number of bytes to check<a name="line.347"></a>
+<span class="sourceLineNo">348</span> * @return true if this is a .gz stream, false otherwise<a name="line.348"></a>
+<span class="sourceLineNo">349</span> *<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * @since 1.1<a name="line.350"></a>
+<span class="sourceLineNo">351</span> */<a name="line.351"></a>
+<span class="sourceLineNo">352</span> public static boolean matches(byte[] signature, int length) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> if (length < 2) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> return false;<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> if (signature[0] != 31) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> return false;<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span> if (signature[1] != -117) {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> return false;<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span> return true;<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> /**<a name="line.369"></a>
+<span class="sourceLineNo">370</span> * Closes the input stream (unless it is System.in).<a name="line.370"></a>
+<span class="sourceLineNo">371</span> *<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * @since 1.2<a name="line.372"></a>
+<span class="sourceLineNo">373</span> */<a name="line.373"></a>
+<span class="sourceLineNo">374</span> @Override<a name="line.374"></a>
+<span class="sourceLineNo">375</span> public void close() throws IOException {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> if (inf != null) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> inf.end();<a name="line.377"></a>
+<span class="sourceLineNo">378</span> inf = null;<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (this.in != System.in) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> this.in.close();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span>}<a name="line.385"></a>