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

assertion fix

Browse Source
This commit is contained in:
Eugene Zhuravlev
2013-10-27 15:26:24 +01:00
parent 3f1620ed98
commit ebe0d82dc4
1 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ValueDescriptorImpl.java
+31 -34
View File
@@ -116,23 +116,30 @@ public abstract class ValueDescriptorImpl extends NodeDescriptorImpl implements
public Value getValue() {
// the following code makes sense only if we do not use ObjectReference.enableCollection() / disableCollection()
// to keep temporary objects
if (Patches.IBM_JDK_DISABLE_COLLECTION_BUG && myStoredEvaluationContext != null && !myStoredEvaluationContext.getSuspendContext().isResumed() &&
if (Patches.IBM_JDK_DISABLE_COLLECTION_BUG) {
final EvaluationContextImpl evalContext = myStoredEvaluationContext;
if (evalContext != null && !evalContext.getSuspendContext().isResumed() &&
myValue instanceof ObjectReference && VirtualMachineProxyImpl.isCollected((ObjectReference)myValue)) {
final Semaphore semaphore = new Semaphore();
semaphore.down();
myStoredEvaluationContext.getDebugProcess().getManagerThread().invoke(new SuspendContextCommandImpl(myStoredEvaluationContext.getSuspendContext()) {
public void contextAction() throws Exception {
// re-setting the context will cause value recalculation
try {
setContext(myStoredEvaluationContext);
final Semaphore semaphore = new Semaphore();
semaphore.down();
evalContext.getDebugProcess().getManagerThread().invoke(new SuspendContextCommandImpl(evalContext.getSuspendContext()) {
public void contextAction() throws Exception {
// re-setting the context will cause value recalculation
try {
setContext(myStoredEvaluationContext);
}
finally {
semaphore.up();
}
}
finally {
protected void commandCancelled() {
semaphore.up();
}
}
});
semaphore.waitFor();
});
semaphore.waitFor();
}
}
return myValue;
@@ -264,30 +271,20 @@ public abstract class ValueDescriptorImpl extends NodeDescriptorImpl implements
private String getCustomLabel(String label) {
//translate only strings in quotes
final StringBuilder buf = StringBuilderSpinAllocator.alloc();
try {
final Value value = getValue();
if(isShowIdLabel()) {
Renderer lastRenderer = getLastRenderer();
final String idLabel = myStoredEvaluationContext != null && lastRenderer != null ?
((NodeRendererImpl)lastRenderer).getIdLabel(value, myStoredEvaluationContext.getDebugProcess()) :
null;
if(idLabel != null && !label.startsWith(idLabel)) {
buf.append(idLabel);
}
String customLabel = null;
final Value value = getValue();
if(isShowIdLabel()) {
Renderer lastRenderer = getLastRenderer();
final EvaluationContextImpl evalContext = myStoredEvaluationContext;
final String idLabel = evalContext != null && lastRenderer != null && !evalContext.getSuspendContext().isResumed()?
((NodeRendererImpl)lastRenderer).getIdLabel(value, evalContext.getDebugProcess()) :
null;
if(idLabel != null && !label.startsWith(idLabel)) {
customLabel = idLabel;
}
if(label == null) {
//noinspection HardCodedStringLiteral
buf.append("null");
}
else {
buf.append(label);
}
return buf.toString();
}
finally {
StringBuilderSpinAllocator.dispose(buf);
}
final String originalLabel = label == null ? "null" : label;
return customLabel == null? originalLabel : customLabel + originalLabel;
}