Projects >> commons-compress >>ffc026d06b2cafcc77bb426a6a4e7d377afb97aa

Chunk
Conflicting content 
            dest[destOffs++] = (byte) b;
        }

<<<<<<< HEAD
        int c = (destOffs == offs) ? -1 : (destOffs - offs);
        count(c);
=======
        final int c = (destOffs == offs) ? -1 : (destOffs - offs);
>>>>>>> 2cc332cc20f1d988ce6b986ba63e6685709e9ecd
        return c;
    }
Solution content 
            dest[destOffs++] = (byte) b;
        }

        final int c = (destOffs == offs) ? -1 : (destOffs - offs);
        count(c);
        return c;
    }
File
BZip2CompressorInputStream.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private int read(InputStream in) throws IOException {
        int r = in.read();
        if (r != -1) {
            compressedBytesRead++;
        }
        return r;
    }

    private boolean init(boolean isFirstStream) throws IOException {
=======
    private boolean init(final boolean isFirstStream) throws IOException {
>>>>>>> 2cc332cc20f1d988ce6b986ba63e6685709e9ecd
        if (null == in) {
            throw new IOException("No InputStream");
        }
Solution content 
        }
    }

    private int read(InputStream in) throws IOException {
        int r = in.read();
        if (r != -1) {
            compressedBytesRead++;
        }
        return r;
    }

    private boolean init(final boolean isFirstStream) throws IOException {
        if (null == in) {
            throw new IOException("No InputStream");
        }
File
BZip2CompressorInputStream.java
Developer's decision
Combination
Kind of conflict
Method declaration
Method signature
Chunk
Conflicting content 
            throw new IOException("No InputStream");
        }

<<<<<<< HEAD
        int magic0 = read(this.in);
        if (magic0 == -1 && !isFirstStream) {
            return false;
        }
        int magic1 = read(this.in);
        int magic2 = read(this.in);
=======
        final int magic0 = this.in.read();
        if (magic0 == -1 && !isFirstStream) {
            return false;
        }
        final int magic1 = this.in.read();
        final int magic2 = this.in.read();
>>>>>>> 2cc332cc20f1d988ce6b986ba63e6685709e9ecd

        if (magic0 != 'B' || magic1 != 'Z' || magic2 != 'h') {
            throw new IOException(isFirstStream
Solution content 
            throw new IOException("No InputStream");
        }

        final int magic0 = read(this.in);
        if (magic0 == -1 && !isFirstStream) {
            return false;
        }
        final int magic1 = read(this.in);
        final int magic2 = read(this.in);

        if (magic0 != 'B' || magic1 != 'Z' || magic2 != 'h') {
            throw new IOException(isFirstStream
File
BZip2CompressorInputStream.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
                    : "Garbage after a valid BZip2 stream");
        }

<<<<<<< HEAD
        int blockSize = read(this.in);
=======
        final int blockSize = this.in.read();
>>>>>>> 2cc332cc20f1d988ce6b986ba63e6685709e9ecd
        if ((blockSize < '1') || (blockSize > '9')) {
            throw new IOException("BZip2 block size is invalid");
        }
Solution content 
                    : "Garbage after a valid BZip2 stream");
        }

        final int blockSize = read(this.in);
        if ((blockSize < '1') || (blockSize > '9')) {
            throw new IOException("BZip2 block size is invalid");
        }
File
BZip2CompressorInputStream.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
            ) {
            this.currentState = EOF;
            throw new IOException("bad block header");
<<<<<<< HEAD
        } else {
             // subtract block start magic bytes from compressedBytesRead
            fireProgress(currentBlock++, currentStream, compressedBytesRead - 6);
            this.storedBlockCRC = bsGetInt();
            this.blockRandomised = bsR(1) == 1;

            /**
             * Allocate data here instead in constructor, so we do not allocate
             * it if the input file is empty.
             */
            if (this.data == null) {
                this.data = new Data(this.blockSize100k);
            }

            getAndMoveToFrontDecode();
=======
        }
        this.storedBlockCRC = bsGetInt();
        this.blockRandomised = bsR(1) == 1;
>>>>>>> 2cc332cc20f1d988ce6b986ba63e6685709e9ecd

        /**
         * Allocate data here instead in constructor, so we do not allocate
Solution content 
            ) {
            this.currentState = EOF;
            throw new IOException("bad block header");
        }
        // subtract block start magic bytes from compressedBytesRead
        fireProgress(currentBlock++, currentStream, compressedBytesRead - 6);
        this.storedBlockCRC = bsGetInt();
        this.blockRandomised = bsR(1) == 1;

        /**
         * Allocate data here instead in constructor, so we do not allocate
File
BZip2CompressorInputStream.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
If statement
Method invocation
Chunk
Conflicting content 
        if (bsLiveShadow < n) {
            final InputStream inShadow = this.in;
            do {
<<<<<<< HEAD
                int thech = read(inShadow);
=======
                final int thech = inShadow.read();
>>>>>>> 2cc332cc20f1d988ce6b986ba63e6685709e9ecd

                if (thech < 0) {
                    throw new IOException("unexpected end of stream");
Solution content 
        if (bsLiveShadow < n) {
            final InputStream inShadow = this.in;
            do {
                final int thech = read(inShadow);

                if (thech < 0) {
                    throw new IOException("unexpected end of stream");
File
BZip2CompressorInputStream.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
    }

    private boolean bsGetBit() throws IOException {
<<<<<<< HEAD
        int bsLiveShadow = this.bsLive;
        int bsBuffShadow = this.bsBuff;

        if (bsLiveShadow < 1) {
            int thech = read(this.in);

            if (thech < 0) {
                throw new IOException("unexpected end of stream");
            }

            bsBuffShadow = (bsBuffShadow << 8) | thech;
            bsLiveShadow += 8;
            this.bsBuff = bsBuffShadow;
        }

        this.bsLive = bsLiveShadow - 1;
        return ((bsBuffShadow >> (bsLiveShadow - 1)) & 1) != 0;
=======
        return bsR(1) != 0;
>>>>>>> 2cc332cc20f1d988ce6b986ba63e6685709e9ecd
    }

    private char bsGetUByte() throws IOException {
Solution content 
    }

    private boolean bsGetBit() throws IOException {
        return bsR(1) != 0;
    }

    private char bsGetUByte() throws IOException {
File
BZip2CompressorInputStream.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation
Return statement
Variable