commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject [4/5] commons-compress git commit: cosmetics
Date Sat, 04 Feb 2017 19:21:20 GMT
cosmetics


Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/2adac25c
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/2adac25c
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/2adac25c

Branch: refs/heads/PR13
Commit: 2adac25cff02050da5c789406b7161a61ee12160
Parents: 88dad2d
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Sat Feb 4 19:42:43 2017 +0100
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Sat Feb 4 19:42:43 2017 +0100

----------------------------------------------------------------------
 .../compressors/bzip2/BZip2CompressorInputStream.java        | 2 +-
 .../org/apache/commons/compress/utils/BitInputStream.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-compress/blob/2adac25c/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
index cf22e65..a6e2d10 100644
--- a/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
+++ b/src/main/java/org/apache/commons/compress/compressors/bzip2/BZip2CompressorInputStream.java
@@ -236,7 +236,7 @@ public class BZip2CompressorInputStream extends CompressorInputStream
implements
             throw new IOException("No InputStream");
         }
 
-        if(!isFirstStream) {
+        if (!isFirstStream) {
             bin.clearBitCache();
         }
 

http://git-wip-us.apache.org/repos/asf/commons-compress/blob/2adac25c/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
index 5531a04..387e804 100644
--- a/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
+++ b/src/main/java/org/apache/commons/compress/utils/BitInputStream.java
@@ -84,8 +84,9 @@ public class BitInputStream implements Closeable {
         if (count < 0 || count > MAXIMUM_CACHE_SIZE) {
             throw new IllegalArgumentException("count must not be negative or greater than
" + MAXIMUM_CACHE_SIZE);
         }
-        if(ensureCache(count))
+        if (ensureCache(count)) {
             return -1;
+        }
 
         if (bitsCachedSize < count) {
             return processBitsGreater57(count);
@@ -124,14 +125,13 @@ public class BitInputStream implements Closeable {
             bitsCached |= bitsToAdd;
             overflow = nextByte & MASKS[overflowBits];
         }
-        bitsCachedSize = count;
         bitsOut = bitsCached & MASKS[count];
         bitsCached = overflow;
         bitsCachedSize = overflowBits;
         return bitsOut;
-	}
+    }
 
-	/**
+    /**
      * Fills the cache up to 56 bits
      * @param count
      * @return return true, when EOF


Mime
View raw message