From 0ab340d1794e40783fd0ee2bb95bc885094a498d Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 24 Feb 2015 20:14:33 +0300 Subject: [PATCH] EA-65307 - ISE: XDebugSessionImpl.getRunContentDescriptor --- .../intellij/debugger/ui/DebuggerPanelsManager.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerPanelsManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerPanelsManager.java index eaf49dc37b29..3c346146ef60 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerPanelsManager.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerPanelsManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -42,6 +42,7 @@ import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Comparing; import com.intellij.xdebugger.XDebugProcess; import com.intellij.xdebugger.XDebugProcessStarter; import com.intellij.xdebugger.XDebugSession; @@ -222,12 +223,9 @@ public class DebuggerPanelsManager implements ProjectComponent { } private static DebuggerSession getSession(Project project, RunContentDescriptor descriptor) { - for (XDebugSession session : XDebuggerManager.getInstance(project).getDebugSessions()) { - if (session.getRunContentDescriptor().equals(descriptor)) { - XDebugProcess process = session.getDebugProcess(); - if (process instanceof JavaDebugProcess) { - return ((JavaDebugProcess)process).getDebuggerSession(); - } + for (JavaDebugProcess process : XDebuggerManager.getInstance(project).getDebugProcesses(JavaDebugProcess.class)) { + if (Comparing.equal(process.getProcessHandler(), descriptor.getProcessHandler())) { + return process.getDebuggerSession(); } } return null;