Projects >> accumulo >>b2008ca92a6861c75e6f531176461a4d3e33c403

Chunk
Conflicting content
      super();
    }

<<<<<<< HEAD
    public RangeInputSplit(RangeInputSplit other) throws IOException {
      super(other);
    }

    public RangeInputSplit(String table, String tableId, Range range, String[] locations) {
      super(table, tableId, range, locations);
=======
    public RangeInputSplit(RangeInputSplit split) throws IOException {
      this.setRange(split.getRange());
      this.setLocations(split.getLocations());
    }

    protected RangeInputSplit(String table, Range range, String[] locations) {
      super(range, locations);
>>>>>>> 0607c8cf0bb1a4088c0c333063c8fea9bf834fd5
    }
  }
}
Solution content
      super();
    }

    public RangeInputSplit(RangeInputSplit other) throws IOException {
      super(other);
    }

    public RangeInputSplit(String table, String tableId, Range range, String[] locations) {
      super(table, tableId, range, locations);
    }

    protected RangeInputSplit(String table, Range range, String[] locations) {
      super(table, "", range, locations);
    }
  }
}
File
InputFormatBase.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method invocation
Method signature
Chunk
Conflicting content
      super();
    }

<<<<<<< HEAD
    public RangeInputSplit(RangeInputSplit other) throws IOException {
      super(other);
    }

    protected RangeInputSplit(String table, String tableId, Range range, String[] locations) {
      super(table, tableId, range, locations);
=======
    public RangeInputSplit(RangeInputSplit split) throws IOException {
      this.setRange(split.getRange());
      this.setLocations(split.getLocations());
    }

    protected RangeInputSplit(String table, Range range, String[] locations) {
      super(range, locations);
>>>>>>> 0607c8cf0bb1a4088c0c333063c8fea9bf834fd5
    }
  }
}
Solution content
      super();
    }

    public RangeInputSplit(RangeInputSplit other) throws IOException {
      super(other);
    }

    protected RangeInputSplit(String table, Range range, String[] locations) {
      super(table, "", range, locations);
    }

    public RangeInputSplit(String table, String tableId, Range range, String[] locations) {
      super(table, tableId, range, locations);
    }
  }
}
File
InputFormatBase.java
Developer's decision
Manual
Kind of conflict
Method declaration
Method invocation
Method signature