Projects >> realm-java >>efe5943c08fc312ac810c178e6a5342912e86223

Chunk
Conflicting content
    @Override
    public int getColumnIndexOrThrow(String fieldName) throws IllegalArgumentException {
        checkClosed();
<<<<<<< HEAD
        if (DEFAULT_ID_COLUMN.equals(columnName)) {
            return (int) idColumnIndex;
        }
        int index = (int) table.getColumnIndex(columnName);
=======

        int index;
        if (DEFAULT_ID_COLUMN.equals(fieldName)) {
            index = (int) idColumnIndex;
        } else {
            index = (int) table.getColumnIndex(fieldName);
        }
>>>>>>> f3dd2528371c1b454ec61a29d3eedc0b3a313538
        if (index == TableOrView.NO_MATCH) {
            throw new IllegalArgumentException(fieldName + " not found in this cursor.");
        }
Solution content
    @Override
    public int getColumnIndexOrThrow(String fieldName) throws IllegalArgumentException {
        checkClosed();

        int index;
        if (DEFAULT_ID_COLUMN.equals(fieldName)) {
            index = (int) idColumnIndex;
        } else {
            index = (int) table.getColumnIndex(fieldName);
        }
        if (index == TableOrView.NO_MATCH) {
            throw new IllegalArgumentException(fieldName + " not found in this cursor.");
        }
File
RealmCursor.java
Developer's decision
Version 2
Kind of conflict
Cast expression
If statement
Variable