MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-78740 Fix already disposed exception: save the GitRepositoryManager instance.

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-03-07 20:17:24 +04:00
parent c196902845
commit f8246980b7
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/push/GitPusher.java
+10 -8
View File
@@ -69,12 +69,13 @@ public final class GitPusher {
private static final String INDICATOR_TEXT = "Pushing";
private static final int MAX_PUSH_ATTEMPTS = 10;
private final Project myProject;
private final ProgressIndicator myProgressIndicator;
private final Collection<GitRepository> myRepositories;
private final GitVcsSettings mySettings;
private final GitPushSettings myPushSettings;
private final Git myGit;
private final @NotNull Project myProject;
private final @NotNull GitRepositoryManager myRepositoryManager;
private final @NotNull ProgressIndicator myProgressIndicator;
private final @NotNull Collection<GitRepository> myRepositories;
private final @NotNull GitVcsSettings mySettings;
private final @NotNull GitPushSettings myPushSettings;
private final @NotNull Git myGit;
public static void showPushDialogAndPerformPush(@NotNull final Project project) {
final GitPushDialog dialog = new GitPushDialog(project);
@@ -121,7 +122,8 @@ public final class GitPusher {
public GitPusher(@NotNull Project project, @NotNull ProgressIndicator indicator) {
myProject = project;
myProgressIndicator = indicator;
myRepositories = GitRepositoryManager.getInstance(project).getRepositories();
myRepositoryManager = GitRepositoryManager.getInstance(myProject);
myRepositories = myRepositoryManager.getRepositories();
mySettings = GitVcsSettings.getInstance(myProject);
myPushSettings = GitPushSettings.getInstance(myProject);
myGit = ServiceManager.getService(Git.class);
@@ -241,7 +243,7 @@ public final class GitPusher {
break;
}
}
GitRepositoryManager.getInstance(myProject).updateAllRepositories(GitRepository.TrackedTopic.BRANCHES); // new remote branch may be created
myRepositoryManager.updateAllRepositories(GitRepository.TrackedTopic.BRANCHES); // new remote branch may be created
return pushResult;
}