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

EA-66645 - IE: JavaExecutionStack.calcIcon - error 15

Browse Source
This commit is contained in:
Egor.Ushakov
2015-03-19 15:59:55 +03:00
parent 4256f57774
commit 4e5a5bd442
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class JavaExecutionStack extends XExecutionStack {
if (current) {
return AllIcons.Debugger.ThreadCurrent;
}
else if (threadProxy.getThreadReference().isAtBreakpoint()) {
else if (threadProxy.isAtBreakpoint()) {
return AllIcons.Debugger.ThreadAtBreakpoint;
}
else if (threadProxy.isSuspended()) {
java/debugger/impl/src/com/intellij/debugger/jdi/ThreadReferenceProxyImpl.java
+10 -1
View File
@@ -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.
@@ -303,4 +303,13 @@ public final class ThreadReferenceProxyImpl extends ObjectReferenceProxyImpl imp
return false;
}
}
public boolean isAtBreakpoint() {
try {
return getThreadReference().isAtBreakpoint();
} catch (InternalException e) {
LOG.info(e);
}
return false;
}
}
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java
+2 -2
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 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.
@@ -100,7 +100,7 @@ public class ThreadDescriptorImpl extends NodeDescriptorImpl implements ThreadDe
}
myIsExpandable = calcExpandable(myIsSuspended);
mySuspendContext = SuspendManagerUtil.getSuspendContextForThread(suspendContext, thread);
myIsAtBreakpoint = suspendManager != null? SuspendManagerUtil.findContextByThread(suspendManager, thread) != null : thread.getThreadReference().isAtBreakpoint();
myIsAtBreakpoint = suspendManager != null? SuspendManagerUtil.findContextByThread(suspendManager, thread) != null : thread.isAtBreakpoint();
myIsCurrent = suspendContext != null? suspendContext.getThread() == thread : false;
myIsFrozen = suspendManager != null? suspendManager.isFrozen(thread) : myIsSuspended;
}