| Chunk |
|---|
| Conflicting content |
|---|
}
public synchronized void addPacket(short apid, long instant, short seq) throws RocksDBException {
<<<<<<< HEAD
=======
//System.out.println("adding apid: "+apid+" instant: "+instant+" seq: "+seq);
>>>>>>> 17a28f5f7a4a5505f6c722616561692b86ffaf51
RocksIterator it = db.newIterator();
try {
it.seek(Record.key(apid, instant, seq)); |
| Solution content |
|---|
}
public synchronized void addPacket(short apid, long instant, short seq) throws RocksDBException {
RocksIterator it = db.newIterator();
try {
it.seek(Record.key(apid, instant, seq)); |
| File |
|---|
| CccsdsTmIndex.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
it.prev();
rleft = new Record(it.key(),it.value());
<<<<<<< HEAD
=======
//System.out.println("here rleft: "+rleft+" rright: "+rright);
>>>>>>> 17a28f5f7a4a5505f6c722616561692b86ffaf51
cleft = compare(apid,instant,seq,rleft);
// System.out.println("arleft="+arleft+"\narright="+arright); |
| Solution content |
|---|
it.prev();
rleft = new Record(it.key(),it.value());
cleft = compare(apid,instant,seq,rleft);
// System.out.println("arleft="+arleft+"\narright="+arright); |
| File |
|---|
| CccsdsTmIndex.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |