opendev/gerrit
Code Issues Proposed changes

Ignore OrmDuplicateKeyException during PUT .../reviewed

Browse Source 
If the reviewed flag has already been set for the calling user return
200 OK instead of throwing a 500 error at the client.  This condition
can be caused by a race between the getExisting() call and the
database write being completed.

Change-Id: I1e4c6391cf7e3cfed280dee6abd749fb0934dec0
This commit is contained in:
Shawn Pearce
2013-08-14 23:42:59 -07:00
parent 81a37a868e
commit 4c74694915
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gerrit-server/src/main/java/com/google/gerrit/server/change/Reviewed.java
View File

@@ -18,6 +18,7 @@ import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestModifyView; import com.google.gerrit.extensions.restapi.RestModifyView;
import com.google.gerrit.reviewdb.client.AccountPatchReview; import com.google.gerrit.reviewdb.client.AccountPatchReview;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gwtorm.server.OrmDuplicateKeyException;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject; import com.google.inject.Inject;
import com.google.inject.Provider; import com.google.inject.Provider;
@@ -42,9 +43,13 @@ class Reviewed {
ReviewDb db = dbProvider.get(); ReviewDb db = dbProvider.get();
AccountPatchReview apr = getExisting(db, resource); AccountPatchReview apr = getExisting(db, resource);
if (apr == null) { if (apr == null) {
db.accountPatchReviews().insert( try {
Collections.singleton(new AccountPatchReview(resource.getPatchKey(), db.accountPatchReviews().insert(
resource.getAccountId()))); Collections.singleton(new AccountPatchReview(resource.getPatchKey(),
resource.getAccountId())));
} catch (OrmDuplicateKeyException e) {
return Response.ok("");
}
return Response.created(""); return Response.created("");
} else { } else {
return Response.ok(""); return Response.ok("");