From f4e0e8bb5ba4fad5a672b3b403a12b94c624864a Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Mon, 8 Jun 2015 00:46:01 +0200 Subject: Don't use RepositoryProvider.getProvider() directly to avoid deadlocks Added ResourceUtil.getGitProvider(IProject) and ResourceUtil.isSharedWithGit(IResource) utility methods which mimics the code in the RepositoryProvider.getProvider() without accessing any locks. Bug: 469555 Change-Id: I2349280b7fe73289a2a1cd9e8c802f8f7499327c Signed-off-by: Andrey Loskutov Signed-off-by: Matthias Sohn --- .../src/org/eclipse/egit/ui/variables/DynamicVariablesTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/variables') diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/variables/DynamicVariablesTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/variables/DynamicVariablesTest.java index e5b6b73637..97cf84ec9d 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/variables/DynamicVariablesTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/variables/DynamicVariablesTest.java @@ -85,8 +85,8 @@ public class DynamicVariablesTest extends EGitTestCase { repository2 = FileRepositoryBuilder.create(gitDir2); repository2.create(); - RepositoryMapping mapping = new RepositoryMapping(project, gitDir); - RepositoryMapping mapping2 = new RepositoryMapping(project2, gitDir2); + RepositoryMapping mapping = RepositoryMapping.create(project, gitDir); + RepositoryMapping mapping2 = RepositoryMapping.create(project2, gitDir2); GitProjectData projectData = new GitProjectData(project); GitProjectData projectData2 = new GitProjectData(project2); -- cgit v1.2.3