You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2012/03/31 13:59:42 UTC

svn commit: r1307777 - /commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java

Author: ggregory
Date: Sat Mar 31 11:59:42 2012
New Revision: 1307777

URL: http://svn.apache.org/viewvc?rev=1307777&view=rev
Log:
Refactor duplicate code in a private method (still a PMD warning through 1 instead of 2).

Modified:
    commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java

Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java?rev=1307777&r1=1307776&r2=1307777&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/compressors/gzip/GzipCompressorInputStream.java Sat Mar 31 11:59:42 2012
@@ -181,12 +181,12 @@ public class GzipCompressorInputStream e
 
         // Original file name, ignored
         if ((flg & FNAME) != 0) {
-            while (inData.readUnsignedByte() != 0x00) {}
+            readToNull(inData);
         }
 
         // Comment, ignored
         if ((flg & FCOMMENT) != 0) {
-            while (inData.readUnsignedByte() != 0x00) {}
+            readToNull(inData);
         }
 
         // Header "CRC16" which is actually a truncated CRC32 (which isn't
@@ -206,6 +206,10 @@ public class GzipCompressorInputStream e
         return true;
     }
 
+    private void readToNull(DataInputStream inData) throws IOException {
+        while (inData.readUnsignedByte() != 0x00) {}
+    }
+
     /** {@inheritDoc} */
     @Override
     public int read() throws IOException {