Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Bill Burke 2015-09-28 16:05:22 -04:00
commit 3ebbe96786

View file

@ -792,7 +792,7 @@ public class UsersResource {
}
ClientModel clientModel = realm.getClientById(client);
if (client == null) {
if (clientModel == null) {
throw new NotFoundException("Client not found");
}