Fix NPE in GitblitClient

diff --git a/releases.moxie b/releases.moxie
index c473d4fc05375f86f8d1b22a5ec4f17660b01f8a..7314160d18c65f994f0d57b5eb81667608f7f285 100644 (file)
--- a/releases.moxie
+++ b/releases.moxie
@@ -38,6 +38,7 @@ r24: {
     - Fixed Ticket responsible selections not considering the AUTHENTICATED authorization control (ticket-91)
     - Fixed invalid generated SSH url for port 22 (issue-444, ticket-98)
     - Fix cloning repositories with `+` in their names. (revert pr-136, issue-362, ticket-100)
+    - Fixed NPE in GitblitClient (ticket-102)
     changes:
     - Split the pages servlet into a raw servlet and a pages servlet. All raw links now use the raw servlet (issue-413, ticket-49)
     - Drop deprecated --set-upstream syntax for -u (ticket-59)

diff --git a/src/main/java/com/gitblit/client/GitblitClient.java b/src/main/java/com/gitblit/client/GitblitClient.java
index 66625a8eaff6eb60927715475344686c17fe2c93..f5bba1add3674644f79db7104d6174503302669b 100644 (file)
--- a/src/main/java/com/gitblit/client/GitblitClient.java
+++ b/src/main/java/com/gitblit/client/GitblitClient.java
@@ -253,9 +253,11 @@ public class GitblitClient implements Serializable {
 \r
                // create list of available scripts by excluding inherited scripts\r
                List<String> scripts = new ArrayList<String>();\r
-               for (String script : settings.pushScripts) {\r
-                       if (!inherited.contains(script)) {\r
-                               scripts.add(script);\r
+               if (!ArrayUtils.isEmpty(settings.pushScripts)) {\r
+                       for (String script : settings.pushScripts) {\r
+                               if (!inherited.contains(script)) {\r
+                                       scripts.add(script);\r
+                               }\r
                        }\r
                }\r
                return scripts;\r