mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-25 14:21:33 +02:00
Code Issues Projects Releases Wiki Activity

MapDBLog: clone byte[] before deserializing

Browse Source 
- workaround for Kryo buffer underflow case
Change-Id: I0a9566f66fcd6fac3a91dda87f59d01fbed2d43a
This commit is contained in:
Yuta HIGUCHI 2014-11-19 22:01:54 -08:00 committed by Yuta Higuchi
parent faf9e1c3b0
commit 1ec4166b62
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/store/dist/src/main/java/org/onlab/onos/store/service/impl/MapDBLog.java vendored
View File

@ -146,7 +146,7 @@ public class MapDBLog implements Log {
DB db = txMaker.makeTx(); DB db = txMaker.makeTx();
try { try {
BTreeMap<Long, byte[]> log = getLogMap(db); BTreeMap<Long, byte[]> log = getLogMap(db);
return log.isEmpty() ? null : verifyNotNull(serializer.decode(log.firstEntry().getValue())); return log.isEmpty() ? null : verifyNotNull(decodeEntry(log.firstEntry().getValue()));
} finally { } finally {
db.close(); db.close();
} }
@ -164,6 +164,13 @@ public class MapDBLog implements Log {
} }
} }
private <T extends Entry> T decodeEntry(final byte[] bytes) {
if (bytes == null) {
return null;
}
return serializer.decode(bytes.clone());
}
@Override @Override
public <T extends Entry> List<T> getEntries(long from, long to) { public <T extends Entry> List<T> getEntries(long from, long to) {
assertIsOpen(); assertIsOpen();
@ -179,7 +186,7 @@ public class MapDBLog implements Log {
} }
List<T> entries = new ArrayList<>((int) (to - from + 1)); List<T> entries = new ArrayList<>((int) (to - from + 1));
for (long i = from; i <= to; i++) { for (long i = from; i <= to; i++) {
T entry = verifyNotNull(serializer.decode(log.get(i)), "LogEntry %s was null", i); T entry = verifyNotNull(decodeEntry(log.get(i)), "LogEntry %s was null", i);
entries.add(entry); entries.add(entry);
} }
return entries; return entries;
@ -195,7 +202,7 @@ public class MapDBLog implements Log {
try { try {
BTreeMap<Long, byte[]> log = getLogMap(db); BTreeMap<Long, byte[]> log = getLogMap(db);
byte[] entryBytes = log.get(index); byte[] entryBytes = log.get(index);
return entryBytes == null ? null : verifyNotNull(serializer.decode(entryBytes), return entryBytes == null ? null : verifyNotNull(decodeEntry(entryBytes),
"LogEntry %s was null", index); "LogEntry %s was null", index);
} finally { } finally {
db.close(); db.close();
@ -220,7 +227,7 @@ public class MapDBLog implements Log {
DB db = txMaker.makeTx(); DB db = txMaker.makeTx();
try { try {
BTreeMap<Long, byte[]> log = getLogMap(db); BTreeMap<Long, byte[]> log = getLogMap(db);
return log.isEmpty() ? null : verifyNotNull(serializer.decode(log.lastEntry().getValue())); return log.isEmpty() ? null : verifyNotNull(decodeEntry(log.lastEntry().getValue()));
} finally { } finally {
db.close(); db.close();
} }