diff options
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.core')
2 files changed, 15 insertions, 8 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java index 9b39f87b9..093d9ef41 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java @@ -62,6 +62,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.mylyn.commons.core.StatusHandler; import org.eclipse.mylyn.commons.net.AbstractWebLocation; import org.eclipse.mylyn.commons.net.AuthenticationCredentials; import org.eclipse.mylyn.commons.net.AuthenticationType; @@ -1650,9 +1651,11 @@ public class BugzillaClient { } } - throw new CoreException(RepositoryStatus.createHtmlStatus(repositoryUrl.toString(), IStatus.INFO, + RepositoryStatus status = RepositoryStatus.createHtmlStatus(repositoryUrl.toString(), IStatus.INFO, BugzillaCorePlugin.ID_PLUGIN, RepositoryStatus.ERROR_REPOSITORY, - "A repository error has occurred.", body)); //$NON-NLS-1$ + "A repository error has occurred.", body); //$NON-NLS-1$ + StatusHandler.log(status); + throw new CoreException(status); } catch (ParseException e) { loggedIn = false; diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java index 64b4d0e9d..caeb3e5a3 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java @@ -911,18 +911,22 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { } } // Set the OS and the Platform in the taskData - if (bugzillaOS != null && opSysAttribute != null) { + if (bugzillaOS != null && opSysAttribute != null && opSysAttribute.getOption(bugzillaOS) != null) { opSysAttribute.setValue(bugzillaOS); - } else if (opSysAttribute != null && opSysAttribute.getOption(OPTION_ALL) != null) { - opSysAttribute.setValue(OPTION_ALL); } - if (bugzillaPlatform != null && platformAttribute != null) { + /*else if (opSysAttribute != null && opSysAttribute.getOption(OPTION_ALL) != null) { + opSysAttribute.setValue(OPTION_ALL); + }*/ + + if (bugzillaPlatform != null && platformAttribute != null + && platformAttribute.getOption(bugzillaPlatform) != null) { platformAttribute.setValue(bugzillaPlatform); - } else if (opSysAttribute != null && platformAttribute != null + } + /*else if (opSysAttribute != null && platformAttribute != null && platformAttribute.getOption(OPTION_ALL) != null) { opSysAttribute.setValue(OPTION_ALL); - } + }*/ } catch (Exception e) { StatusHandler.log(new Status(IStatus.ERROR, BugzillaCorePlugin.ID_PLUGIN, "could not set platform options", //$NON-NLS-1$ |