From 69fef440867d94c4c14fbf4e057b0c7e5de6260e Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Mon, 16 Jun 2014 20:19:42 +0200
Subject: [PATCH] Don't use deprecated method (fixed PY-13172 among others).

---
 .../intellij/remote/RemoteSdkProducer.java    |  2 ++
 .../python/console/PydevConsoleRunner.java    | 20 ++++++++-----------
 .../python/run/PyRemoteProcessStarter.java    |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/remote/RemoteSdkProducer.java b/platform/platform-impl/src/com/intellij/remote/RemoteSdkProducer.java
index b3461bf08210..849d02d6d64f 100644
--- a/platform/platform-impl/src/com/intellij/remote/RemoteSdkProducer.java
+++ b/platform/platform-impl/src/com/intellij/remote/RemoteSdkProducer.java
@@ -28,6 +28,7 @@ public interface RemoteSdkProducer<T extends RemoteSdkCredentials> {
    * @throws InterruptedException
    * @deprecated
    */
+  @Deprecated
   T getRemoteSdkCredentials() throws InterruptedException;
 
   T getRemoteSdkCredentials(boolean allowSynchronousInteraction) throws InterruptedException, ExecutionException;
@@ -38,6 +39,7 @@ public interface RemoteSdkProducer<T extends RemoteSdkCredentials> {
    * @param remoteSdkCredentialsConsumer
    * @deprecated
    */
+  @Deprecated
   void produceRemoteSdkCredentials(Consumer<T> remoteSdkCredentialsConsumer);
 
   Object getRemoteSdkDataKey();
diff --git a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
index 221337572811..ba2f137751a4 100644
--- a/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
+++ b/python/src/com/jetbrains/python/console/PydevConsoleRunner.java
@@ -131,6 +131,7 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
   public static Key<Sdk> CONSOLE_SDK = new Key<Sdk>("PYDEV_CONSOLE_SDK_KEY");
 
   private static final long APPROPRIATE_TO_WAIT = 60000;
+  private PyRemoteSdkCredentials myRemoteCredentials;
 
   protected PydevConsoleRunner(@NotNull final Project project,
                                @NotNull Sdk sdk, @NotNull final PyConsoleType consoleType,
@@ -352,16 +353,16 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
     myCommandLine = commandLine.getCommandLineString();
 
     try {
-      PyRemoteSdkCredentials remoteCredentials = data.getRemoteSdkCredentials();
+      myRemoteCredentials = data.getRemoteSdkCredentials(true);
       PathMappingSettings mappings = manager.setupMappings(getProject(), data, null);
 
       RemoteSshProcess remoteProcess =
-        manager.createRemoteProcess(getProject(), remoteCredentials, mappings, commandLine, true);
+        manager.createRemoteProcess(getProject(), myRemoteCredentials, mappings, commandLine, true);
 
 
       Pair<Integer, Integer> remotePorts = getRemotePortsFromProcess(remoteProcess);
 
-      remoteProcess.addLocalTunnel(myPorts[0], remoteCredentials.getHost(), remotePorts.first);
+      remoteProcess.addLocalTunnel(myPorts[0], myRemoteCredentials.getHost(), remotePorts.first);
       remoteProcess.addRemoteTunnel(remotePorts.second, "localhost", myPorts[1]);
 
 
@@ -425,15 +426,10 @@ public class PydevConsoleRunner extends AbstractConsoleRunnerWithHistory<PythonC
       if (manager != null) {
         PyRemoteSdkAdditionalDataBase data = (PyRemoteSdkAdditionalDataBase)mySdk.getSdkAdditionalData();
         assert data != null;
-        try {
-          myProcessHandler =
-            manager.createConsoleProcessHandler(process, data.getRemoteSdkCredentials(), getConsoleView(), myPydevConsoleCommunication,
-                                                myCommandLine, CharsetToolkit.UTF8_CHARSET,
-                                                manager.setupMappings(getProject(), data, null));
-        }
-        catch (InterruptedException e) {
-          LOG.error("Error getting remote credentials");
-        }
+        myProcessHandler =
+          manager.createConsoleProcessHandler(process, myRemoteCredentials, getConsoleView(), myPydevConsoleCommunication,
+                                              myCommandLine, CharsetToolkit.UTF8_CHARSET,
+                                              manager.setupMappings(getProject(), data, null));
       }
       else {
         LOG.error("Can't create remote console process handler");
diff --git a/python/src/com/jetbrains/python/run/PyRemoteProcessStarter.java b/python/src/com/jetbrains/python/run/PyRemoteProcessStarter.java
index d5ba031d6d67..168e8013d552 100644
--- a/python/src/com/jetbrains/python/run/PyRemoteProcessStarter.java
+++ b/python/src/com/jetbrains/python/run/PyRemoteProcessStarter.java
@@ -74,7 +74,7 @@ public class PyRemoteProcessStarter {
     try {
       settings = manager.setupMappings(project, pyRemoteSdkAdditionalDataBase, settings);
 
-      return manager.startRemoteProcess(project, pyRemoteSdkAdditionalDataBase.getRemoteSdkCredentials(), commandLine,
+      return manager.startRemoteProcess(project, pyRemoteSdkAdditionalDataBase.getRemoteSdkCredentials(true), commandLine,
                                         settings);
     }
     catch (InterruptedException e) {