opendev/gerrit
Code Issues Proposed changes

Merge "Provide descriptive message for NoSuchProjectException"

Browse Source
This commit is contained in:
David Pursehouse
2013-02-18 12:12:03 +00:00
committed by Gerrit Code Review
parent 7125a01aa2 88c3263465
commit 07a471b9d9
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/args4j/ProjectControlHandler.java
View File

@@ -65,7 +65,7 @@ public class ProjectControlHandler extends OptionHandler<ProjectControl> {
Project.NameKey nameKey = new Project.NameKey(nameWithoutSuffix);
control = projectControlFactory.validateFor(nameKey, ProjectControl.OWNER | ProjectControl.VISIBLE);
} catch (NoSuchProjectException e) {
throw new CmdLineException(owner, "'" + projectName + "': is not a Gerrit project");
throw new CmdLineException(owner, e.getMessage());
}
setter.addValue(control);

4
gerrit-server/src/main/java/com/google/gerrit/server/project/NoSuchProjectException.java
View File

@@ -20,11 +20,13 @@ import com.google.gerrit.reviewdb.client.Project;
public class NoSuchProjectException extends Exception {
private static final long serialVersionUID = 1L;
private static final String MESSAGE = "Project not found: ";
public NoSuchProjectException(final Project.NameKey key) {
this(key, null);
}
public NoSuchProjectException(final Project.NameKey key, final Throwable why) {
super(key.toString(), why);
super(MESSAGE + key.toString(), why);
}
}

2
gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
View File

@@ -428,7 +428,7 @@ public abstract class BaseCommand implements Command {
try {
thunk.run();
} catch (NoSuchProjectException e) {
throw new UnloggedFailure(1, e.getMessage() + " no such project");
throw new UnloggedFailure(1, e.getMessage());
} catch (NoSuchChangeException e) {
throw new UnloggedFailure(1, e.getMessage() + " no such change");
}