diff options
| author | James Moger <james.moger@gitblit.com> | 2013-11-26 08:47:57 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-11-26 08:47:57 -0500 |
| commit | 67389b9e7060b7f917a8383ec04d3a0c6bd24c5c (patch) | |
| tree | 61c41c8da6c09f2bc64ed1c72c8523d42a11f01c | |
| parent | 3daba4304dba818d54eb9b74d8d35df5aab8fee5 (diff) | |
| download | gitblit-67389b9e7060b7f917a8383ec04d3a0c6bd24c5c.tar.gz gitblit-67389b9e7060b7f917a8383ec04d3a0c6bd24c5c.zip | |
Fix NPE when adding a permission without a registrant (issue-344)
Change-Id: Id6bf070a43072a61a0034bd2d971fc819c9b03e3
| -rw-r--r-- | .classpath | 5 | ||||
| -rw-r--r-- | releases.moxie | 2 | ||||
| -rw-r--r-- | src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java | 3 |
3 files changed, 10 insertions, 0 deletions
@@ -74,5 +74,10 @@ <classpathentry kind="lib" path="ext/commons-logging-1.1.1.jar" sourcepath="ext/src/commons-logging-1.1.1.jar" /> <classpathentry kind="lib" path="ext/commons-exec-1.1.jar" sourcepath="ext/src/commons-exec-1.1.jar" /> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" /> + <classpathentry kind="src" path="src/main/dagger"> + <attributes> + <attribute name="optional" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin/classes" /> </classpath> diff --git a/releases.moxie b/releases.moxie index 5433a9da..ca298251 100644 --- a/releases.moxie +++ b/releases.moxie @@ -12,6 +12,7 @@ r20: { fixes: - Fixed support for implied SSH urls in web.otherUrls (issue-311) - Bind LDAP connection after establishing TLS initialization (issue-343) + - Fixed NPE when attempting to add a permission without a registrant (issue-344) - Fix potential NPE on removing uncached repository from cache - Ignore the default contents of .git/description file - Fix error on generating activity page when there is no activity @@ -72,6 +73,7 @@ r20: { - Domingo Oropeza - Chris Graham - Guenter Dressel + - fpeters.fae } # diff --git a/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java b/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java index b728082b..dd25c48a 100644 --- a/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java @@ -261,6 +261,9 @@ public class RegistrantPermissionsPanel extends BasePanel { if (rp.permission == null) { return; } + if (rp.registrant == null) { + return; + } RegistrantAccessPermission copy = DeepCopier.copy(rp); if (StringUtils.findInvalidCharacter(copy.registrant) != null) { copy.permissionType = PermissionType.REGEX; |