diff options
Diffstat (limited to 'gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java')
-rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java index c6ffffc81f..d8e7480fdf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/notedb/rebuild/ConflictingUpdateException.java @@ -1,4 +1,4 @@ -// Copyright (C) 2016 The Android Open Source Project +// Copyright (C) 2017 The Android Open Source Project // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,16 +14,19 @@ package com.google.gerrit.server.notedb.rebuild; -import com.google.gerrit.reviewdb.client.Change; -import com.google.gwtorm.server.OrmRuntimeException; +import com.google.gwtorm.server.OrmException; -class ConflictingUpdateException extends OrmRuntimeException { +/** + * {@link com.google.gwtorm.server.OrmException} thrown by {@link ChangeRebuilder} when rebuilding a + * change failed because another operation modified its {@link + * com.google.gerrit.server.notedb.NoteDbChangeState}. + */ +public class ConflictingUpdateException extends OrmException { private static final long serialVersionUID = 1L; - ConflictingUpdateException(Change change, String expectedNoteDbState) { - super( - String.format( - "Expected change %s to have noteDbState %s but was %s", - change.getId(), expectedNoteDbState, change.getNoteDbState())); + // Always created from a ConflictingUpdateRuntimeException because it originates from an + // AtomicUpdate, which cannot throw checked exceptions. + ConflictingUpdateException(ConflictingUpdateRuntimeException cause) { + super(cause.getMessage(), cause); } } |