From bdd54def1244f14a196f50b4d7f061c97d9bcc54 Mon Sep 17 00:00:00 2001
From: fbecker
Date: Sun, 16 Jan 2011 16:20:40 +0000
Subject: ASSIGNED - bug 333779: better way to handle configuration changes
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=333779

---
 .../bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
index da7aa9b7d..36bcf105f 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
@@ -461,14 +461,16 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
 		AuthenticationCredentials httpAuth = repository.getCredentials(AuthenticationType.HTTP);
 		AuthenticationCredentials proxyAuth = repository.getCredentials(AuthenticationType.PROXY);
 		boolean changed = repository.getCharacterEncoding() != getCharacterEncoding();
+		String descriptorFileName = repository.getProperty(IBugzillaConstants.BUGZILLA_DESCRIPTOR_FILE);
+		if (descriptorFileName == null) {
+			descriptorFileName = ""; //$NON-NLS-1$
+		}
 		changed = changed || repository.getSavePassword(AuthenticationType.REPOSITORY) != getSavePassword();
 		changed = changed || repositoryAuth.getUserName().compareTo(getUserName()) != 0;
 		changed = changed || repositoryAuth.getPassword().compareTo(getPassword()) != 0;
 		changed = changed
 				|| Boolean.parseBoolean(repository.getProperty(IBugzillaConstants.BUGZILLA_USE_XMLRPC)) != useXMLRPCstatusTransitions.getSelection();
-		changed = changed
-				|| descriptorFile.getText().compareTo(
-						repository.getProperty(IBugzillaConstants.BUGZILLA_DESCRIPTOR_FILE)) != 0;
+		changed = changed || descriptorFileName.compareTo(descriptorFile.getText()) != 0;
 		if (httpAuth != null) {
 			changed = changed || httpAuth.getUserName().compareTo(getHttpAuthUserId()) != 0
 					|| httpAuth.getPassword().compareTo(getHttpAuthPassword()) != 0
-- 
cgit v1.2.3