sijie closed pull request #1076: Fixing validation in
BookieShell.scanEntryLogForSpecificEntry
URL: https://github.com/apache/bookkeeper/pull/1076
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
index 51aa79fff..44fcaa9bf 100644
---
a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
+++
b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/BookieShell.java
@@ -3157,15 +3157,16 @@ protected void scanEntryLogForSpecificEntry(long logId,
final long ledgerId, fin
final MutableBoolean entryFound = new MutableBoolean(false);
scanEntryLog(logId, new EntryLogScanner() {
@Override
- public boolean accept(long ledgerId) {
- return (((!entryFound.booleanValue()) || (entryId == -1)));
+ public boolean accept(long candidateLedgerId) {
+ return ((candidateLedgerId == ledgerId) &&
((!entryFound.booleanValue()) || (entryId == -1)));
}
@Override
- public void process(long ledgerId, long startPos, ByteBuf entry) {
+ public void process(long candidateLedgerId, long startPos, ByteBuf
entry) {
long entrysLedgerId = entry.getLong(entry.readerIndex());
long entrysEntryId = entry.getLong(entry.readerIndex() + 8);
- if ((ledgerId == entrysLedgerId) && ((entrysEntryId ==
entryId)) || (entryId == -1)) {
+ if ((candidateLedgerId == entrysLedgerId) &&
(candidateLedgerId == ledgerId)
+ && ((entrysEntryId == entryId) || (entryId == -1))) {
entryFound.setValue(true);
formatEntry(startPos, entry, printMsg);
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
