Merge branch 'stable-2.15'
* stable-2.15:
Fix logic in NoteDbMigrator#canSkipPrimaryStorageMigration
Change-Id: Ib6642b8b38556ab2f5d906bac25d2160dedd2522
diff --git a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
index 216e95a..c11aeef 100644
--- a/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
+++ b/java/com/google/gerrit/server/notedb/rebuild/NoteDbMigrator.java
@@ -667,10 +667,10 @@
*/
private static boolean canSkipPrimaryStorageMigration(ReviewDb db, Change.Id id) {
try {
- return Iterables.isEmpty(db.patchSets().byChange(id));
+ return Iterables.isEmpty(unwrapDb(db).patchSets().byChange(id));
} catch (Exception e) {
- log.error("Error checking if change " + id + " is corrupt, assuming yes", e);
- return true;
+ log.error("Error checking if change " + id + " can be skipped, assuming no", e);
+ return false;
}
}