Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-06-16 08:58:34 -0400
committerMichael Valenta2005-06-16 08:58:34 -0400
commitb0d4599b3133bed48053dde9d9f9653b7863fa4e (patch)
treee7ad9b838b4febd96f08d35af5fa8e5a70ec35b4
parentb5842f51b341936a32f6d81325670f1e736c28fe (diff)
downloadeclipse.platform.team-b0d4599b3133bed48053dde9d9f9653b7863fa4e.tar.gz
eclipse.platform.team-b0d4599b3133bed48053dde9d9f9653b7863fa4e.tar.xz
eclipse.platform.team-b0d4599b3133bed48053dde9d9f9653b7863fa4e.zip
Bug 100118 NPE when switching fields in merge wizard
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java
index f6a629a40..12ddd91c6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/MergeWizardPage.java
@@ -221,7 +221,7 @@ public class MergeWizardPage extends CVSWizardPage {
}
protected void setStartTag(CVSTag selectedTag) {
- if (selectedTag == null || startTag != null || !endTag.equals(selectedTag)) {
+ if (selectedTag == null || startTag != null || endTag == null || !endTag.equals(selectedTag)) {
startTag = selectedTag;
if (startTagField != null) {
String name = startTagField.getText();

Back to the top