Merge branch 'stable-2.6'

* stable-2.6:
  Shift the change table's dataCell CSS a bit
  Fix: wrong error message on MyWatchedProjectsScreen
  Upgrade Apache SSH dependency to 0.6.0
This commit is contained in:
Shawn Pearce
2013-04-09 20:55:45 -07:00
3 changed files with 11 additions and 1 deletions

View File

@@ -23,4 +23,8 @@ public class NoSuchEntityException extends Exception {
public NoSuchEntityException() {
super(MESSAGE);
}
public NoSuchEntityException(String message) {
super(message);
}
}

View File

@@ -514,6 +514,8 @@ a:hover {
padding-right: 5px;
border-right: 1px solid trimColor;
border-bottom: 1px solid trimColor;
vertical-align: middle;
height: 20px;
}
.changeTable a.gwt-InlineHyperlink {

View File

@@ -72,7 +72,11 @@ public class BaseServiceImplementation {
} 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) {