diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-07 12:23:23 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-07 12:23:23 -0500 |
| commit | c346a9c84fb14713b4974304c96bf3c1d6f508e0 (patch) | |
| tree | eead48e51f64a21fd133d38b217c8f14e030f77e /src | |
| parent | 6d298ca7046b945869278992694069329eb37c1a (diff) | |
| download | gitblit-c346a9c84fb14713b4974304c96bf3c1d6f508e0.tar.gz gitblit-c346a9c84fb14713b4974304c96bf3c1d6f508e0.zip | |
Fix NPE in the Edit Ticket page
Diffstat (limited to 'src')
| -rw-r--r-- | 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 5fa31975..ac759589 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 @@ public class EditTicketPage extends RepositoryPage { 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);
}
|