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

Change-Id: Id6bf070a43072a61a0034bd2d971fc819c9b03e3

diff --git a/.classpath b/.classpath
index 2803f8d6e48d6ea49634875a34a718ea0e8f73fa..91e6a8bc03188153131bf490660cc84190d4f3d6 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -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 5433a9da22ec912f075dcde759fc838a58fdd2d6..ca2982519aa1c99be8020f41352a0cf74f1da9f2 100644 (file)
--- 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 b728082b816fcae82f1704798c9da8d0b5a53467..dd25c48a4ebdf097b4c351f3504b69dc77d2a62a 100644 (file)
--- 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;