From c346a9c84fb14713b4974304c96bf3c1d6f508e0 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 07 Mar 2014 12:23:23 -0500
Subject: [PATCH] Fix NPE in the Edit Ticket page
---
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
index 5fa3197..ac75958 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -134,13 +134,14 @@
Change change = new Change(createdBy);
String title = titleModel.getObject();
- if (!ticket.title.equals(title)) {
+ if (!StringUtils.isEmpty(title) && !ticket.title.equals(title)) {
// title change
change.setField(Field.title, title);
}
String description = descriptionEditor.getText();
- if (!ticket.body.equals(description)) {
+ if ((StringUtils.isEmpty(ticket.body) && !StringUtils.isEmpty(description))
+ || (!StringUtils.isEmpty(ticket.body) && !ticket.body.equals(description))) {
// description change
change.setField(Field.body, description);
}
--
Gitblit v1.9.1