opendev/gerrit
Code Issues Proposed changes

Merge "Internal server error when running apropos command without doc index"

Browse Source
This commit is contained in:
Edwin Kempin 2014-02-04 13:12:07 +00:00 committed by Gerrit Code Review
commit 6a06f1596b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java
View File

@ -16,6 +16,7 @@ package com.google.gerrit.sshd.commands;
import com.google.gerrit.server.config.CanonicalWebUrl; import com.google.gerrit.server.config.CanonicalWebUrl;
import com.google.gerrit.server.documentation.QueryDocumentationExecutor; import com.google.gerrit.server.documentation.QueryDocumentationExecutor;
import com.google.gerrit.server.documentation.QueryDocumentationExecutor.DocQueryException;
import com.google.gerrit.server.documentation.QueryDocumentationExecutor.DocResult; import com.google.gerrit.server.documentation.QueryDocumentationExecutor.DocResult;
import com.google.gerrit.sshd.CommandMetaData; import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand; import com.google.gerrit.sshd.SshCommand;
@ -37,10 +38,14 @@ final class AproposCommand extends SshCommand {
@Override @Override
public void run() throws Exception { public void run() throws Exception {
try {
List<QueryDocumentationExecutor.DocResult> res = searcher.doQuery(q); List<QueryDocumentationExecutor.DocResult> res = searcher.doQuery(q);
for (DocResult docResult : res) { for (DocResult docResult : res) {
stdout.println(String.format("%s:\n%s%s\n", docResult.title, url, stdout.println(String.format("%s:\n%s%s\n", docResult.title, url,
docResult.url)); docResult.url));
} }
} catch (DocQueryException dqe) {
throw new UnloggedFailure(1, "fatal: " + dqe.getMessage());
}
} }
} }