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-143358 Unregister authenticators on project dispose if they don't get unregistered for some reason

Browse Source 
HTTP and SSH Authenticators hold a link to the Project,
while the GitXmlRpcHandlerService is application wide.

Normally, authenticators are unregistered on Git processTerminated,
or if an exception happens.
But if some reason this doesn't happen, we want to make sure that the
Project doesn't leak.
This commit is contained in:
Kirill Likhodedov
2015-11-22 17:29:03 +03:00
parent 5878c5dbc0
commit 86eb25d344
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/commands/GitHandler.java
+2 -2
View File
@@ -456,7 +456,7 @@ public abstract class GitHandler {
GitHttpAuthService service = ServiceManager.getService(GitHttpAuthService.class);
myEnv.put(GitAskPassXmlRpcHandler.GIT_ASK_PASS_ENV, service.getScriptPath().getPath());
GitHttpAuthenticator httpAuthenticator = service.createAuthenticator(myProject, myCommand, ObjectUtils.assertNotNull(myUrls));
myHttpHandler = service.registerHandler(httpAuthenticator);
myHttpHandler = service.registerHandler(httpAuthenticator, myProject);
myEnvironmentCleanedUp = false;
myEnv.put(GitAskPassXmlRpcHandler.GIT_ASK_PASS_HANDLER_ENV, Integer.toString(myHttpHandler));
int port = service.getXmlRcpPort();
@@ -468,7 +468,7 @@ public abstract class GitHandler {
private void setupSshAuthenticator() throws IOException {
GitXmlRpcSshService ssh = ServiceManager.getService(GitXmlRpcSshService.class);
myEnv.put(GitSSHHandler.GIT_SSH_ENV, ssh.getScriptPath().getPath());
mySshHandler = ssh.registerHandler(new GitSSHGUIHandler(myProject));
mySshHandler = ssh.registerHandler(new GitSSHGUIHandler(myProject), myProject);
myEnvironmentCleanedUp = false;
myEnv.put(GitSSHHandler.SSH_HANDLER_ENV, Integer.toString(mySshHandler));
int port = ssh.getXmlRcpPort();
plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitXmlRpcHandlerService.java
+12 -3
View File
@@ -16,6 +16,8 @@
package org.jetbrains.git4idea.ssh;
import com.intellij.ide.XmlRpcServer;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.io.FileUtilRt;
import gnu.trove.THashMap;
import org.apache.commons.codec.DecoderException;
@@ -105,18 +107,25 @@ public abstract class GitXmlRpcHandlerService<T> {
/**
* Register handler. Note that handlers must be unregistered using {@link #unregisterHandler(int)}.
*
* @param handler a handler to register
* @param handler a handler to register
* @param parentDisposable a disposable to unregister the handler if it doesn't get unregistered manually
* @return an identifier to pass to the environment variable
*/
public int registerHandler(@NotNull T handler) {
public int registerHandler(@NotNull T handler, @NotNull Disposable parentDisposable) {
synchronized (HANDLERS_LOCK) {
XmlRpcServer xmlRpcServer = XmlRpcServer.SERVICE.getInstance();
if (!xmlRpcServer.hasHandler(myHandlerName)) {
xmlRpcServer.addHandler(myHandlerName, createRpcRequestHandlerDelegate());
}
int key = myNextHandlerKey;
final int key = myNextHandlerKey;
handlers.put(key, handler);
Disposer.register(parentDisposable, new Disposable() {
@Override
public void dispose() {
handlers.remove(key);
}
});
myNextHandlerKey++;
return key;
}