Browse Source

Fix NPE when adding a permission without a registrant (issue-344)

Change-Id: Id6bf070a43072a61a0034bd2d971fc819c9b03e3
tags/v1.4.0
James Moger 10 years ago
parent
commit
67389b9e70

+ 5
- 0
.classpath View File

@@ -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>

+ 2
- 0
releases.moxie View File

@@ -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
}

#

+ 3
- 0
src/main/java/com/gitblit/wicket/panels/RegistrantPermissionsPanel.java View File

@@ -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;

Loading…
Cancel
Save