opendev/gerrit
Code Issues Proposed changes

Catch multiple exceptions in REST views

Browse Source 
Change-Id: I62eb25317656758b4b21ca68261edb70392c9458
This commit is contained in:
David Ostrovsky
2013-11-30 09:41:26 +01:00
parent d66e854d6d
commit 8ba03ff10b
4 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-server/src/main/java/com/google/gerrit/server/account/CreateEmail.java
View File

@@ -124,10 +124,7 @@ public class CreateEmail implements RestModifyView<AccountResource, Input> {
try { try {
registerNewEmailFactory.create(email).send(); registerNewEmailFactory.create(email).send();
info.pendingConfirmation = true; info.pendingConfirmation = true;
} catch (EmailException e) { } catch (EmailException | RuntimeException e) {
log.error("Cannot send email verification message to " + email, e);
throw e;
} catch (RuntimeException e) {
log.error("Cannot send email verification message to " + email, e); log.error("Cannot send email verification message to " + email, e);
throw e; throw e;
} }

9
gerrit-server/src/main/java/com/google/gerrit/server/change/EditMessage.java
View File

@@ -101,14 +101,11 @@ class EditMessage implements RestModifyView<RevisionResource, Input>,
patchSetInserterFactory)); patchSetInserterFactory));
} catch (InvalidChangeOperationException e) { } catch (InvalidChangeOperationException e) {
throw new BadRequestException(e.getMessage()); throw new BadRequestException(e.getMessage());
} catch (MissingObjectException e) {
throw new ResourceConflictException(e.getMessage());
} catch (IncorrectObjectTypeException e) {
throw new ResourceConflictException(e.getMessage());
} catch (PatchSetInfoNotAvailableException e) {
throw new ResourceConflictException(e.getMessage());
} catch (NoSuchChangeException e) { } catch (NoSuchChangeException e) {
throw new ResourceNotFoundException(); throw new ResourceNotFoundException();
} catch (MissingObjectException | IncorrectObjectTypeException
| PatchSetInfoNotAvailableException e) {
throw new ResourceConflictException(e.getMessage());
} finally { } finally {
git.close(); git.close();
} }

4
gerrit-server/src/main/java/com/google/gerrit/server/change/Files.java
View File

@@ -162,9 +162,7 @@ class Files implements ChildCollection<RevisionResource, FileResource> {
if (!o.isEmpty()) { if (!o.isEmpty()) {
try { try {
r = copy(Sets.newHashSet(o), old, resource, userId); r = copy(Sets.newHashSet(o), old, resource, userId);
} catch (IOException e) { } catch (IOException | PatchListNotAvailableException e) {
log.warn("Cannot copy patch review flags", e);
} catch (PatchListNotAvailableException e) {
log.warn("Cannot copy patch review flags", e); log.warn("Cannot copy patch review flags", e);
} }
break; break;

8
gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java
View File

@@ -179,13 +179,7 @@ public class Mergeable implements RestReadView<RevisionResource> {
indexer.index(c); indexer.index(c);
} }
return mergeable; return mergeable;
} catch (MergeException e) { } catch (MergeException | IOException | NoSuchProjectException e) {
return false;
} catch (IOException e) {
log.error(String.format(
"Cannot merge test change %d", change.getId().get()), e);
return false;
} catch (NoSuchProjectException e) {
log.error(String.format( log.error(String.format(
"Cannot merge test change %d", change.getId().get()), e); "Cannot merge test change %d", change.getId().get()), e);
return false; return false;