diff options
author | Andrey Loskutov | 2015-06-07 22:46:01 +0000 |
---|---|---|
committer | Matthias Sohn | 2015-07-03 22:36:19 +0000 |
commit | f4e0e8bb5ba4fad5a672b3b403a12b94c624864a (patch) | |
tree | e86c56fe1ca804d84e39876f8f8509c11d8697e7 /org.eclipse.egit.ui.test/src/org/eclipse | |
parent | cfd23827fd0ac27f027fb5683462037969342ace (diff) | |
download | egit-f4e0e8bb5ba4fad5a672b3b403a12b94c624864a.tar.gz egit-f4e0e8bb5ba4fad5a672b3b403a12b94c624864a.tar.xz egit-f4e0e8bb5ba4fad5a672b3b403a12b94c624864a.zip |
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 <loskutov@gmx.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse')
-rw-r--r-- | org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/variables/DynamicVariablesTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
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); |