From bf4f4371f55aac605fbb92c06857a08820146117 Mon Sep 17 00:00:00 2001
From: Michael Golubev <michael.golubev@jetbrains.com>
Date: Wed, 11 Mar 2015 14:27:58 +0100
Subject: [PATCH] IDEA-137488 - CloudFoundry: NPE on undeploy of an application

---
 .../remoteServer/impl/runtime/ServerConnectionImpl.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java
index 6fc7d9bdc8a0..116442c04bac 100644
--- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java
+++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java
@@ -142,7 +142,8 @@ public class ServerConnectionImpl<D extends DeploymentConfiguration> implements
         myLogManagers.put(deploymentName, logManager);
         handler.printlnSystemMessage("Deploying '" + deploymentName + "'...");
         onDeploymentStarted.run(deploymentName);
-        instance.deploy(task, logManager, new DeploymentOperationCallbackImpl(deploymentName, (DeploymentTaskImpl<D>)task, handler, deployment));
+        instance
+          .deploy(task, logManager, new DeploymentOperationCallbackImpl(deploymentName, (DeploymentTaskImpl<D>)task, handler, deployment));
       }
     });
   }
@@ -290,7 +291,10 @@ public class ServerConnectionImpl<D extends DeploymentConfiguration> implements
             }
           }
         }
-        myLogManagers.remove(deploymentName).disposeLogs();
+        DeploymentLogManagerImpl logManager = myLogManagers.remove(deploymentName);
+        if (logManager != null) {
+          logManager.disposeLogs();
+        }
         myEventDispatcher.queueDeploymentsChanged(ServerConnectionImpl.this);
         computeDeployments(myRuntimeInstance, EmptyRunnable.INSTANCE);
       }