aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Thun2011-03-28 08:49:58 (EDT)
committerPhilipp Thun2011-03-28 09:02:27 (EDT)
commit21a3ca721dbb05b395f2bd1582e2f6ee7043506b (patch)
treeda23e34249ce079a8828243dbef926fe41ba8aab
parentff823317d0005bd3009396845e576315bdffb546 (diff)
downloadegit-21a3ca721dbb05b395f2bd1582e2f6ee7043506b.zip
egit-21a3ca721dbb05b395f2bd1582e2f6ee7043506b.tar.gz
egit-21a3ca721dbb05b395f2bd1582e2f6ee7043506b.tar.bz2
Fix possible NPE in CommitDialogrefs/changes/44/2944/1
Change-Id: I567013dcbb831e629820ea378cfd072a58e79672 Signed-off-by: Philipp Thun <philipp.thun@sap.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
index eb45d09..a7fc608 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommitDialog.java
@@ -621,7 +621,8 @@ public class CommitDialog extends Dialog {
commitText.setText(previousCommitMessage.replaceAll(
"\n", Text.DELIMITER)); //$NON-NLS-1$
}
- authorText.setText(previousAuthor);
+ if (previousAuthor != null)
+ authorText.setText(previousAuthor);
}
refreshChangeIdText();
}