Prevent <nil> from being stored as a milestone

diff --git a/src/main/java/com/gitblit/wicket/pages/TicketPage.java b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
index 3eb88dd5ab1dfd44812c62601e962b50f2776f13..dde31a2a64232d2b2ad2194fb1bff3cf0da96a15 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/TicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/TicketPage.java
@@ -456,7 +456,7 @@ public class TicketPage extends TicketBasePage {
                                                public void onClick(AjaxRequestTarget target) {\r
                                                        TicketMilestone milestone = getModel().getObject();\r
                                                        Change change = new Change(user.username);\r
-                                                       if (NIL.equals(milestone.name)) {\r
+                                                       if (NIL.equals(milestone.name) || ESC_NIL.equals(milestone.name)) {\r
                                                                change.setField(Field.milestone, "");\r
                                                        } else {\r
                                                                change.setField(Field.milestone, milestone.name);\r