commit | 97de06b300cb398d061feef57f269b3c0557f737 | [log] [tgz] |
---|---|---|
author | Shawn Pearce <sop@google.com> | Wed Apr 10 03:55:12 2013 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Apr 10 03:55:13 2013 +0000 |
tree | 6b639c3f625d24306914c2ff4e3d0184cb4c0096 | |
parent | 95b36751c4cc8da67e2cc4a150b49cbdffaf6b0d [diff] | |
parent | f74e85fc75a8863f54f313e3038394aa08f9b397 [diff] |
Merge "Upgrade Apache SSH dependency to 0.6.0" into stable-2.6
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchEntityException.java b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchEntityException.java index c47cf07..1829c8b 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchEntityException.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/errors/NoSuchEntityException.java
@@ -23,4 +23,8 @@ public NoSuchEntityException() { super(MESSAGE); } + + public NoSuchEntityException(String message) { + super(message); + } }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css index 255412d..9425443 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
@@ -514,6 +514,8 @@ padding-right: 5px; border-right: 1px solid trimColor; border-bottom: 1px solid trimColor; + vertical-align: middle; + height: 20px; } .changeTable a.gwt-InlineHyperlink {
diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java index b124824..3277992 100644 --- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java +++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/BaseServiceImplementation.java
@@ -72,7 +72,11 @@ } catch (InvalidQueryException e) { callback.onFailure(e); } catch (NoSuchProjectException e) { - callback.onFailure(new NoSuchEntityException()); + if (e.getMessage() != null) { + callback.onFailure(new NoSuchEntityException(e.getMessage())); + } else { + callback.onFailure(new NoSuchEntityException()); + } } catch (NoSuchGroupException e) { callback.onFailure(new NoSuchEntityException()); } catch (OrmRuntimeException e) {