Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrelves2009-02-18 14:09:46 -0500
committerrelves2009-02-18 14:09:46 -0500
commit22183ad4e7caf4380edd0af3a9992b97dc2f42b7 (patch)
tree858501a70642bf84e61cf1c362850c15f1bdff04
parentc6943158b9431560150c2f08ed7c607b8748100d (diff)
downloadorg.eclipse.mylyn.tasks-e_3_4_m_3_0_x.tar.gz
org.eclipse.mylyn.tasks-e_3_4_m_3_0_x.tar.xz
org.eclipse.mylyn.tasks-e_3_4_m_3_0_x.zip
263318: [m3.0.5] Fix for Bugzilla (BMO) bug 26257 Breaks MylynR_3_0_5e_3_4_m_3_0_x
https://bugs.eclipse.org/bugs/show_bug.cgi?id=263318
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaClient.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java2
-rw-r--r--org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java2
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java2
4 files changed, 4 insertions, 4 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 3bd775d92..0a255cd35 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
@@ -1360,7 +1360,7 @@ public class BugzillaClient {
}
if (found) {
throw new CoreException(new BugzillaStatus(IStatus.ERROR, BugzillaCorePlugin.ID_PLUGIN,
- RepositoryStatus.REPOSITORY_SUSPICIOUS_ACTION));
+ IBugzillaConstants.REPOSITORY_STATUS_SUSPICIOUS_ACTION));
}
found = false;
for (Iterator<String> iterator = bugzillaLanguageSettings.getResponseForCommand(
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java
index aae69b467..4d9b59999 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaTaskDataHandler.java
@@ -256,7 +256,7 @@ public class BugzillaTaskDataHandler extends AbstractTaskDataHandler {
// TODO: Move retry handling into client
if (e.getStatus().getCode() == RepositoryStatus.ERROR_REPOSITORY_LOGIN) {
return client.postTaskData(taskData, monitor);
- } else if (e.getStatus().getCode() == RepositoryStatus.REPOSITORY_SUSPICIOUS_ACTION) {
+ } else if (e.getStatus().getCode() == IBugzillaConstants.REPOSITORY_STATUS_SUSPICIOUS_ACTION) {
taskData.getRoot().removeAttribute(BugzillaAttribute.TOKEN.getKey());
return client.postTaskData(taskData, monitor);
} else {
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
index 379159a28..e23a04470 100644
--- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
+++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/IBugzillaConstants.java
@@ -100,6 +100,8 @@ public interface IBugzillaConstants {
public static final String ENCODING_UTF_8 = "UTF-8";
+ public static final int REPOSITORY_STATUS_SUSPICIOUS_ACTION = 99;
+
/** Supported bugzilla repository versions */
static public enum BugzillaServerVersion {
SERVER_218, SERVER_220, SERVER_222, SERVER_30, SERVER_32;
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java
index 2791035d1..b78779799 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/RepositoryStatus.java
@@ -47,8 +47,6 @@ public class RepositoryStatus extends Status {
public final static int REPOSITORY_LOGGED_OUT = 10;
- public final static int REPOSITORY_SUSPICIOUS_ACTION = 11;
-
public final static int ERROR_INTERNAL = 7;
private String htmlMessage;

Back to the top