From b461a45f420471f931029898d97464ecc5039f49 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 22 Dec 2012 00:27:04 -0500
Subject: [PATCH] Do not pass null email address to PersonIdent
---
src/com/gitblit/wicket/pages/ForksPage.java | 2 +-
src/com/gitblit/wicket/pages/UserPage.java | 2 +-
src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/ForksPage.java b/src/com/gitblit/wicket/pages/ForksPage.java
index 6155f3e..cc48387 100644
--- a/src/com/gitblit/wicket/pages/ForksPage.java
+++ b/src/com/gitblit/wicket/pages/ForksPage.java
@@ -58,7 +58,7 @@
if (repository.isPersonalRepository()) {
UserModel user = GitBlit.self().getUserModel(repository.projectPath.substring(1));
- PersonIdent ident = new PersonIdent(user.getDisplayName(), user.emailAddress);
+ PersonIdent ident = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress);
item.add(new GravatarImage("anAvatar", ident, 20));
if (pageRepository.equals(repository)) {
// do not link to self
diff --git a/src/com/gitblit/wicket/pages/UserPage.java b/src/com/gitblit/wicket/pages/UserPage.java
index d3e93c6..f4331dd 100644
--- a/src/com/gitblit/wicket/pages/UserPage.java
+++ b/src/com/gitblit/wicket/pages/UserPage.java
@@ -97,7 +97,7 @@
email.setRenderBodyOnly(true);
add(email.setVisible(GitBlit.getBoolean(Keys.web.showEmailAddresses, true) && !StringUtils.isEmpty(user.emailAddress)));
- PersonIdent person = new PersonIdent(user.getDisplayName(), user.emailAddress);
+ PersonIdent person = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress);
add(new GravatarImage("gravatar", person, 210));
UserModel sessionUser = GitBlitWebSession.get().getUser();
diff --git a/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java b/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
index 689ee57..4156cd1 100644
--- a/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
+++ b/src/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java
@@ -138,10 +138,10 @@
}
} else if (RegistrantType.USER.equals(entry.registrantType)) {
// user
- PersonIdent ident = new PersonIdent(entry.registrant, null);
+ PersonIdent ident = new PersonIdent(entry.registrant, "");
UserModel user = GitBlit.self().getUserModel(entry.registrant);
if (user != null) {
- ident = new PersonIdent(user.getDisplayName(), user.emailAddress);
+ ident = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress);
}
Fragment userFragment = new Fragment("registrant", "userRegistrant", RegistrantPermissionsPanel.this);
--
Gitblit v1.9.1