Projects >> android_libcore >>5288ef70edc3c2b12794a9d018c0aaa953ccebf4

Chunk
Conflicting content 
        compressedSize = ((long) it.readInt()) & 0xffffffffL;
        size = ((long) it.readInt()) & 0xffffffffL;

<<<<<<< HEAD
        nameLength = it.readShort();
        int extraLength = it.readShort();
        int commentByteCount = it.readShort();
=======
        nameLength = it.readShort() & 0xffff;
        int extraLength = it.readShort() & 0xffff;
        int commentLength = it.readShort() & 0xffff;
>>>>>>> 1cec2593103dc175a9ca267cb3f3a4760e2d36a4

        // This is a 32-bit value in the file, but a 64-bit field in this object.
        it.seek(42);
Solution content 
        compressedSize = ((long) it.readInt()) & 0xffffffffL;
        size = ((long) it.readInt()) & 0xffffffffL;

        nameLength = it.readShort() & 0xffff;
        int extraLength = it.readShort() & 0xffff;
        int commentByteCount = it.readShort() & 0xffff;
        // This is a 32-bit value in the file, but a 64-bit field in this object.
        it.seek(42);
File
ZipEntry.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
            // position of the entry's local header. At position 28 we find the
            // length of the extra data. In some cases this length differs from
            // the one coming in the central header.
<<<<<<< HEAD
            RAFStream rafStream = new RAFStream(localRaf, entry.localHeaderRelOffset + 28);
            DataInputStream is = new DataInputStream(rafStream);
            int localExtraLenOrWhatever = Short.reverseBytes(is.readShort());
=======
            RAFStream rafstrm = new RAFStream(raf, entry.mLocalHeaderRelOffset + 28);
            DataInputStream is = new DataInputStream(rafstrm);
            int localExtraLenOrWhatever = Short.reverseBytes(is.readShort()) & 0xffff;
>>>>>>> 1cec2593103dc175a9ca267cb3f3a4760e2d36a4
            is.close();

            // Skip the name and this "extra" data or whatever it is:
Solution content 
            // position of the entry's local header. At position 28 we find the
            // length of the extra data. In some cases this length differs from
            // the one coming in the central header.
            RAFStream rafStream = new RAFStream(localRaf, entry.localHeaderRelOffset + 28);
            DataInputStream is = new DataInputStream(rafStream);
            int localExtraLenOrWhatever = Short.reverseBytes(is.readShort()) & 0xffff;
            is.close();

            // Skip the name and this "extra" data or whatever it is:
File
ZipFile.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable