Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2010-01-10 23:48:36 -0500
committerspingel2010-01-10 23:48:36 -0500
commit577f849ce4af4c3d6855310e52e43468bdcc10e8 (patch)
treece605d6ddfbd2c65bb5e9b21ef22e32686ef67df
parentd08e5656b504c0f5cd322f341767e570439ad477 (diff)
downloadorg.eclipse.mylyn.tasks-577f849ce4af4c3d6855310e52e43468bdcc10e8.tar.gz
org.eclipse.mylyn.tasks-577f849ce4af4c3d6855310e52e43468bdcc10e8.tar.xz
org.eclipse.mylyn.tasks-577f849ce4af4c3d6855310e52e43468bdcc10e8.zip
REOPENED - bug 296894: [releng] fix failing tests for 3.4
https://bugs.eclipse.org/bugs/show_bug.cgi?id=296894
-rw-r--r--org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java8
-rw-r--r--org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java4
2 files changed, 7 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
index d1c7f535a..259ee8ede 100644
--- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
+++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepository.java
@@ -290,7 +290,7 @@ public final class TaskRepository extends PlatformObject {
}
}
- @SuppressWarnings( { "unchecked" })
+ @SuppressWarnings({ "unchecked" })
private Map<String, String> getAuthInfo() {
synchronized (LOCK) {
if (Platform.isRunning()) {
@@ -340,10 +340,12 @@ public final class TaskRepository extends PlatformObject {
setProperty(getKeyPrefix(AuthenticationType.PROXY) + ENABLED, null);
setProperty(getKeyPrefix(AuthenticationType.REPOSITORY) + ENABLED, null);
- synchronized (LOCK) {
- isCachedUserName = false;
+ synchronized (this) {
transientProperties.clear();
+ isCachedUserName = false;
+ }
+ synchronized (LOCK) {
if (Platform.isRunning()) {
if (useSecureStorage()) {
if (Platform.isRunning()) {
diff --git a/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java b/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
index ad136e902..76d09eb21 100644
--- a/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
+++ b/org.eclipse.mylyn.tests.util/src/org/eclipse/mylyn/tests/util/TestFixture.java
@@ -186,7 +186,7 @@ public abstract class TestFixture {
TaskRepository repository = new TaskRepository(connectorKind, repositoryUrl);
Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username,
- credentials.password), true);
+ credentials.password), false);
return repository;
}
@@ -211,7 +211,7 @@ public abstract class TestFixture {
TaskRepository repository = new TaskRepository(connectorKind, repositoryUrl);
Credentials credentials = TestUtil.readCredentials(PrivilegeLevel.USER);
repository.setCredentials(AuthenticationType.REPOSITORY, new AuthenticationCredentials(credentials.username,
- credentials.password), true);
+ credentials.password), false);
configureRepository(repository);
manager.addRepository(repository);
return repository;

Back to the top